Fix more "Attempt to push null on operand stack" variantsHEADmaster

This change fixes more cases in the *Declaration classes that generate code.
Both #336 and #337 are due to the same piece of code not correctly computing
the resolved position because of copying it from a source method when it needs
recomputing for the method being generated. In particular primitive types
and/or double slot types (like long or double) cause the code to miscompute
the resolved positions or set the wrong type of expected type on the stack.

Fixes #336
Fixes #337

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/bugs1924/337/X.aj b/tests/bugs1924/337/X.aj
new file mode 100644
index 000000000..922a6ab67
--- /dev/null
+++ b/tests/bugs1924/337/X.aj
@@ -0,0 +1,12 @@
+public aspect X {

+  pointcut p(long l): call(* F.m(..)) && args(l);

+  Object around (long id): p(id) { return null; }

+

+  public static void main(String []argv) {

+    new F().m(3L);

+  }

+}

+

+class F {

+    public void m(long r) {}

+}