From 587b50334b79246e9f7c5d7865900f7eee953b51 Mon Sep 17 00:00:00 2001
From: Konstantin Kuznetsov <kkonsw@gmail.com>
Date: Tue, 12 Dec 2023 13:53:17 +0300
Subject: [PATCH] Fix incorrect interface override behavior

Allow override with different method return values in case of the interfaces

Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/I8MXLR

Testing: new runtime test to check correct interface override behavior

Signed-off-by: Konstantin Kuznetsov <kkonsw@gmail.com>
---
 ets2panda/checker/ets/helpers.cpp             |  2 +-
 .../ets/InterfaceOverrideReturnTypes.ets      | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 ets2panda/test/runtime/ets/InterfaceOverrideReturnTypes.ets

diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp
index 5e11b6fe85..5e6b94ce42 100644
--- a/ets2panda/checker/ets/helpers.cpp
+++ b/ets2panda/checker/ets/helpers.cpp
@@ -1345,7 +1345,7 @@ bool ETSChecker::IsFunctionContainsSignature(ETSFunctionType *func_type, Signatu
 void ETSChecker::CheckFunctionContainsClashingSignature(const ETSFunctionType *func_type, Signature *signature)
 {
     for (auto *it : func_type->CallSignatures()) {
-        SavedTypeRelationFlagsContext strf_ctx(Relation(), TypeRelationFlag::NO_RETURN_TYPE_CHECK);
+        SavedTypeRelationFlagsContext strf_ctx(Relation(), TypeRelationFlag::NONE);
         Relation()->IsIdenticalTo(it, signature);
         if (Relation()->IsTrue() && it->Function()->Id()->Name() == signature->Function()->Id()->Name()) {
             std::stringstream ss;
diff --git a/ets2panda/test/runtime/ets/InterfaceOverrideReturnTypes.ets b/ets2panda/test/runtime/ets/InterfaceOverrideReturnTypes.ets
new file mode 100644
index 0000000000..87e57dfd1c
--- /dev/null
+++ b/ets2panda/test/runtime/ets/InterfaceOverrideReturnTypes.ets
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+interface A {
+    foo(): A
+}
+
+interface B extends A {
+    foo(): B
+}
+
+class C implements A {
+    private value: string;
+
+    foo(): A {
+        this.value = "foo(): A"
+        return new C();
+     }
+
+    getValue(): string {
+        return this.value;
+    }
+}
+
+class D implements B {
+    private value: string;
+
+    foo(): B {
+        this.value = "foo(): B"
+        return new D();
+    }
+
+    getValue(): string {
+        return this.value;
+    }
+}
+
+function main() {
+    let c = new C();
+    c.foo();
+    assert c.getValue() == "foo(): A"
+
+    let d = new D();
+    d.foo();
+    assert d.getValue() == "foo(): B"
+}
-- 
Gitee