Merge pull request #784 from larsclausen/class-call-void

Handle calling void function from class method

elaborate.cc

@@ -3844,10 +3844,15 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope,
       if (const netclass_t*class_type = net->class_type()) {
 	    NetScope*task = class_type->method_from_name(method_name);
 	    if (task == 0) {
+		    // If an implicit this was added it is not an error if we
+		    // don't find a method. It might actually be a call to a
+		    // function outside of the class.
+		  if (!add_this_flag) {
 			cerr << get_fileline() << ": error: "
 			     << "Can't find task " << method_name
 			     << " in class " << class_type->get_name() << endl;
 			des->errors += 1;
+		  }
 		  return 0;
 	    }
 

ivtest/ivltests/sv_class_method_call_void.v

@@ -0,0 +1,46 @@
+// Check that it is possible to call void function from within a class method.
+// Check this for functions defined outside the class as well as functions that
+// are methods of the class or base class.
+
+integer sum = 0;
+
+function void f1(integer x);
+  sum += x;
+endfunction
+
+class B;
+  function void f2(integer x);
+    sum += x;
+  endfunction
+endclass
+
+class C extends B;
+
+  function void f3(integer x);
+    sum += x;
+  endfunction
+
+  task t;
+    f1(10);
+    f2(20);
+    f3(30);
+  endtask
+
+endclass
+
+module test;
+
+  C c = new;
+
+  initial begin
+    c.t;
+    c.f2(40);
+    c.f3(50);
+    if (sum === 150) begin
+      $display("PASSED");
+    end else begin
+      $display("FAILED");
+    end
+  end
+
+endmodule

ivtest/regress-sv.list

@@ -530,6 +530,7 @@ sv_class_new_fail1	CE,-g2009		ivltests
 sv_class_new_fail2	CE,-g2009		ivltests
 sv_class_new_init	normal,-g2009		ivltests
 sv_class_in_module_decl	normal,-g2009		ivltests
+sv_class_method_call_void	normal,-g2009	ivltests
 sv_class_method_default1 normal,-g2009		ivltests
 sv_class_method_default2 normal,-g2009		ivltests
 sv_class_method_signed1	normal,-g2009		ivltests

ivtest/regress-vlog95.list

@@ -409,6 +409,7 @@ sv_class_extends_scoped	CE,-g2009		ivltests
 sv_class_localparam	CE,-g2009		ivltests
 sv_class_new_init	CE,-g2009		ivltests
 sv_class_in_module_decl	CE,-g2009		ivltests
+sv_class_method_call_void	CE,-g2009	ivltests
 sv_class_method_default1 CE,-g2009		ivltests
 sv_class_method_default2 CE,-g2009		ivltests
 sv_class_method_signed1	CE,-g2009,-pallowsigned=1	ivltests