codegen: Handle NoWrapper attribute of interface methods on caller side

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index b3b578435488b10b4295ff51075507946e7b5ffd..4b353a09e64e560edd6845730d1d72668c4d107e 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -78,7 +78,14 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
                                        set_cvalue (expr, new CCodeIdentifier (get_ccode_name (m.base_method)));
                                }
                        } else if (m.base_interface_method != null) {
-                               set_cvalue (expr, new CCodeIdentifier (get_ccode_name (m.base_interface_method)));
+                               if (m.base_interface_method.get_attribute ("NoWrapper") != null) {
+                                       var base_iface = (Interface) m.base_interface_method.parent_symbol;
+                                       var vclass = new CCodeFunctionCall (new CCodeIdentifier (get_ccode_interface_get_function (base_iface)));
+                                       vclass.add_argument (pub_inst);
+                                       set_cvalue (expr, new CCodeMemberAccess.pointer (vclass, get_ccode_vfunc_name (m)));
+                               } else {
+                                       set_cvalue (expr, new CCodeIdentifier (get_ccode_name (m.base_interface_method)));
+                               }
                        } else if (m is CreationMethod) {
                                set_cvalue (expr, new CCodeIdentifier (get_ccode_real_name (m)));
                        } else {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3a1efb0f34180a917c13af6851cca5753881a28..f92314361d29f31918fcf5acf68ffe92c2daa852 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -219,6 +219,7 @@ TESTS = \
        methods/argument-named.vala \
        methods/delegate-target.vala \
        methods/generics.vala \
+       methods/nowrapper-interface.vala \
        methods/nowrapper-no-vfunc.test \
        methods/params-array.vala \
        methods/params-array-abstract.test \

diff --git a/tests/methods/nowrapper-interface.vala b/tests/methods/nowrapper-interface.vala
new file mode 100644 (file)
index 0000000..ba69d87
--- /dev/null
+++ b/tests/methods/nowrapper-interface.vala
@@ -0,0 +1,15 @@
+interface IFoo : Object {
+       [NoWrapper]
+       public abstract int bar ();
+}
+
+class Foo : Object, IFoo {
+       int bar () {
+               return 42;
+       }
+}
+
+void main () {
+       var foo = new Foo ();
+       assert (foo.bar () == 42);
+}