fix for Bugzilla Bug 41952

   XLint warning for call PCD's using subtype of defining type 

also added extraSourceLocations to IMessage+ for
message with multiple source lines

3 files changed, 7 insertions, 3 deletions

diff --git a/tests/new/CallTypesI.java b/tests/new/CallTypesI.java
index 7ab225106..f9b770ac2 100644
--- a/tests/new/CallTypesI.java
+++ b/tests/new/CallTypesI.java
@@ -53,7 +53,7 @@ interface I1a extends I0 { }
 
 interface I1b extends I0 { }
 
-interface I2 extends I1a, I1b {}
+////interface I2 extends I1a, I1b {}
 
 
 class C0 {
@@ -74,9 +74,11 @@ aspect A {
     before(): call(void C0.mC()) {
 	noteAdvice += "static c0, ";
     }
+    
     before(): call(void C1a.mC()) || call(void C1a.mI()) {
 	noteAdvice += "static c1a, ";
     }
+    
     before(): call(void C1b.mC()) || call(void C1b.mI()) {
 	noteAdvice += "static c1b, ";
     }
diff --git a/tests/new/IndeterminateArg.java b/tests/new/IndeterminateArg.java
index db54c82de..e0b0bfc36 100644
--- a/tests/new/IndeterminateArg.java
+++ b/tests/new/IndeterminateArg.java
@@ -120,7 +120,8 @@ aspect A {
         T.e(name);
     }
 
-    pointcut safe()                                : (call(C+.new(..)) || call(* C+.*(..))); 
+    pointcut safe()                                : (call(C+.new(..))) ||
+                                                        (call(* *.*(..)) && target(C)); 
     // XXX should encode slots, range: a0o1 = args(Object); a3o2Start = args(Object, Object, *)
     pointcut none()                                : args();
     pointcut o1()                                  : args(Object);
diff --git a/tests/new/IndeterminateArgType.java b/tests/new/IndeterminateArgType.java
index 4beb1301e..6a4c58323 100644
--- a/tests/new/IndeterminateArgType.java
+++ b/tests/new/IndeterminateArgType.java
@@ -97,7 +97,8 @@ aspect A {
         T.e(name);
     }
 
-    pointcut safe()                                : call(Safe+.new(..)) || call(* Safe+.*(..)); 
+    pointcut safe()                                : (call(Safe+.new(..))) ||
+                                                        (call(* *.*(..)) && target(Safe)); 
 
     pointcut o1End()                               : args(.., Object);
     pointcut s1End()                               : args(.., String);