From 7bbd1f419239dc9e8b46e7fd912b2bc007bbd76a Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 14 Jan 2004 11:28:13 +0000
Subject: [PATCH] Fix for Bugzilla Bug 46280    compiler issues error on inner
 aspects when privilieged

---
 .../internal/compiler/parser/AjParser.java    |  4 ++
 tests/ajcTests.xml                            |  7 ++++
 tests/bugs/PrivilegedParsing.java             | 41 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 tests/bugs/PrivilegedParsing.java

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java
index 1b1512d28..be36f8dca 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java
@@ -230,6 +230,10 @@ public class AjParser extends Parser {
 		}
 		aspectDecl.modifiersSourceStart = intStack[intPtr--];
 		aspectDecl.modifiers = intStack[intPtr--];
+		if (isPrivileged) {
+			aspectDecl.modifiersSourceStart = intStack[intPtr--];
+			aspectDecl.modifiers |= intStack[intPtr--];
+		}
 		if (aspectDecl.modifiersSourceStart >= 0) {
 			aspectDecl.declarationSourceStart = aspectDecl.modifiersSourceStart;
 		}
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 8b48f4cda..6a68bc4a6 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6964,6 +6964,13 @@
 		  <message kind="error" line="8"/>
         </compile>
     </ajc-test>     
+    
+    <ajc-test dir="bugs" 
+		pr="46280"
+		title="compiler issues error on inner aspects when privilieged">
+        <compile files="PrivilegedParsing.java"/>
+        <run class="PrivilegedParsing"/>
+    </ajc-test>
 
     <ajc-test dir="bugs" pr="44586"
       title="After throwing advice on ctors doesn't execute for inter-type decl field inits">
diff --git a/tests/bugs/PrivilegedParsing.java b/tests/bugs/PrivilegedParsing.java
new file mode 100644
index 000000000..4fd0e66eb
--- /dev/null
+++ b/tests/bugs/PrivilegedParsing.java
@@ -0,0 +1,41 @@
+public class PrivilegedParsing {
+   private int hidden;
+   public int visible;
+   public PrivilegedParsing(int priv, int pub) {
+      hidden = priv;
+      visible = pub;
+   }
+   public void doSomething() {
+      System.out.println("" + hidden + ", " + visible + "");
+   }
+   public static void main(String[] args) {
+      PrivilegedParsing capsule = new PrivilegedParsing(1, 1);
+      capsule.doSomething();
+   }
+}
+
+aspect Outer {
+   static privileged //<== JUST TRY TO UNCOMMENT THIS!
+   aspect Inner {
+      pointcut call2doSomething(PrivilegedParsing capsule):
+         call(void PrivilegedParsing.doSomething())
+         && target(capsule);
+      before(PrivilegedParsing capsule): call2doSomething(capsule) {
+         capsule.visible++;
+         capsule.hidden++;
+      }
+   }
+}
+
+interface Marker {
+   static privileged //<== JUST TRY TO UNCOMMENT THIS!
+   aspect Inner {
+      pointcut call2doSomething(PrivilegedParsing capsule):
+         call(void PrivilegedParsing.doSomething())
+         && target(capsule);
+      before(PrivilegedParsing capsule): call2doSomething(capsule) {
+         capsule.visible++;
+         capsule.hidden++;
+      }
+   }
+}
\ No newline at end of file
-- 
2.39.5