8041521: JDK-8034245 breaks a bootcycle build
authorpgovereau
Tue, 22 Apr 2014 15:59:33 -0700
changeset 24070 3852ce6db3f4
parent 24069 dfb8f11542fc
child 24071 b0845717434e
8041521: JDK-8034245 breaks a bootcycle build Reviewed-by: jjg
langtools/make/tools/genstubs/GenStubs.java
--- a/langtools/make/tools/genstubs/GenStubs.java	Tue Apr 22 17:07:54 2014 -0400
+++ b/langtools/make/tools/genstubs/GenStubs.java	Tue Apr 22 15:59:33 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -316,7 +316,8 @@
                 }
                 defs.add(def);
             }
-            return m.TopLevel(tree.packageAnnotations, tree.pid, defs.toList());
+            tree.defs = tree.defs.intersect(defs.toList());
+            return tree;
         }
 
         @Override