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

8242564: javadoc crashes:: class cast exception com.sun.tools.javac.code.Symtab$6

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vladimir Petko 2024-01-29 21:28:49 +00:00 committed by Jonathan Gibbons
parent e999dfcb40
commit 64c3642c57
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2023, 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
@ -31,6 +31,7 @@ import java.util.*;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import javax.lang.model.type.TypeKind;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
@ -181,6 +182,8 @@ public class ToolEnvironment {
}
public Kind getFileKind(TypeElement te) {
if (te.asType().getKind() == TypeKind.ERROR)
return Kind.OTHER;
JavaFileObject jfo = ((ClassSymbol)te).outermostClass().classfile;
return jfo == null ? Kind.SOURCE : jfo.getKind();
}

61
test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2023, 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
@ -23,26 +23,79 @@
/*
* @test
* @bug 4632553 4973607 8026567
* @bug 4632553 4973607 8026567 8242564
* @summary No need to include type name (class, interface, etc.) before
* every single type in class tree.
* Make sure class tree includes heirarchy for enums and annotation
* types.
* @library ../../lib
* Make sure class tree handles undefined types in the class
* hierarchy.
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build javadoc.tester.*
* @build toolbox.ToolBox javadoc.tester.*
* @run main TestClassTree
*/
import java.io.IOException;
import java.nio.file.Path;
import javadoc.tester.JavadocTester;
import toolbox.ToolBox;
public class TestClassTree extends JavadocTester {
private final ToolBox tb = new ToolBox();
public static void main(String... args) throws Exception {
var tester = new TestClassTree();
tester.runTests();
}
/**
* Given badpkg package containing class ChildClass with UndefinedClass
* base class, implementing UndefinedInterface and a defined
* interface
* When the javadoc is generated with '--ignore-source-errors option'
* Then javadoc exits successfully
* And generates html for the ChildClass with UndefinedClass base class
* And UndefinedInterface is not present in html
*/
@Test
public void testBadPkg(Path base) throws IOException {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"""
package badpkg;
public class ChildClass extends UndefinedClass
implements UndefinedInterface, Iterable {
}
"""
);
javadoc("--ignore-source-errors",
"-d", base.resolve("badout").toString(),
"--no-platform-links",
"-sourcepath", src.toString(),
"badpkg");
checkExit(Exit.OK);
checkOutput("badpkg/package-tree.html", true,
"""
<li class="circle">badpkg.<a href="ChildClass.html" class="type-name-link" title="\
class in badpkg">ChildClass</a> (implements java.lang.Iterable&lt;T&gt;)</li>
""");
checkOutput("badpkg/ChildClass.html", true,
"""
<div class="type-signature"><span class="modifiers">public class </span>\
<span class="element-name type-name-label">ChildClass</span>
<span class="extends-implements">extends UndefinedClass
implements java.lang.Iterable</span></div>
""");
checkOutput("badpkg/ChildClass.html", false, "UndefinedInterface");
}
@Test
public void test() {
javadoc("-d", "out",