stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8160454: JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2016-09-02 05:43:54 -07:00
parent 0a327e7dac
commit 7e27dd569e
3 changed files with 82 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
View File

@ -928,11 +928,6 @@ public abstract class Symbol extends AnnoConstruct implements Element {
return msym;
}
public ModuleSymbol() {
super(MDL, 0, null, null, null);
this.type = new ModuleType(this);
}
public ModuleSymbol(Name name, Symbol owner) {
super(MDL, 0, name, null, owner);
this.type = new ModuleType(this);

12
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
View File

@ -27,6 +27,7 @@ package com.sun.tools.javac.code;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@ -363,6 +364,17 @@ public class Symtab {
// create the basic builtin symbols
unnamedModule = new ModuleSymbol(names.empty, null) {
{
directives = List.nil();
exports = List.nil();
provides = List.nil();
uses = List.nil();
ModuleSymbol java_base = enterModule(names.java_base);
com.sun.tools.javac.code.Directive.RequiresDirective d =
new com.sun.tools.javac.code.Directive.RequiresDirective(java_base,
EnumSet.of(com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED));
requires = List.of(d);
}
@Override
public String toString() {
return messages.getLocalizedString("compiler.misc.unnamed.module");

70
langtools/test/tools/javac/modules/T8160454/NPEGetDirectivesTest.java Normal file
View File

@ -0,0 +1,70 @@
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8160454
* @summary JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
* @modules
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.util
* @compile NPEGetDirectivesTest.java
* @compile -processor NPEGetDirectivesTest NPEGetDirectivesTest.java
*/
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.*;
import java.util.Set;
import com.sun.tools.javac.code.Directive.RequiresDirective;
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
import com.sun.tools.javac.util.Assert;
import static com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED;
@SupportedAnnotationTypes("*")
public class NPEGetDirectivesTest extends AbstractProcessor {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
for (Element e: roundEnv.getRootElements()) {
Element m = e.getEnclosingElement();
while (!(m instanceof ModuleElement)) {
m = m.getEnclosingElement();
}
((ModuleSymbol)m).getDirectives();
RequiresDirective requiresDirective = ((ModuleSymbol)m).requires.head;
Assert.check(requiresDirective.getDependency().getQualifiedName().toString().equals("java.base"));
Assert.check(requiresDirective.flags.contains(MANDATED));
}
return false;
}
@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
}