Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
6f6b3e67
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6f6b3e67
编写于
2月 15, 2010
作者:
D
darcy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6634138: Source generated in last round not compiled
Reviewed-by: jjg
上级
d318761e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
209 addition
and
31 deletion
+209
-31
src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
...un/tools/javac/processing/JavacProcessingEnvironment.java
+32
-17
test/tools/javac/T6403466.java
test/tools/javac/T6403466.java
+20
-14
test/tools/javac/processing/6634138/Dummy.java
test/tools/javac/processing/6634138/Dummy.java
+27
-0
test/tools/javac/processing/6634138/ExerciseDependency.java
test/tools/javac/processing/6634138/ExerciseDependency.java
+37
-0
test/tools/javac/processing/6634138/T6634138.java
test/tools/javac/processing/6634138/T6634138.java
+93
-0
未找到文件。
src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
浏览文件 @
6f6b3e67
...
@@ -874,20 +874,9 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
...
@@ -874,20 +874,9 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
JavaFileManager
fileManager
=
currentContext
.
get
(
JavaFileManager
.
class
);
JavaFileManager
fileManager
=
currentContext
.
get
(
JavaFileManager
.
class
);
List
<
JavaFileObject
>
fileObjects
=
List
.
nil
();
for
(
JavaFileObject
jfo
:
filer
.
getGeneratedSourceFileObjects
()
)
{
fileObjects
=
fileObjects
.
prepend
(
jfo
);
}
compiler
=
JavaCompiler
.
instance
(
currentContext
);
compiler
=
JavaCompiler
.
instance
(
currentContext
);
List
<
JCCompilationUnit
>
parsedFiles
=
compiler
.
parseFiles
(
fileObjects
);
List
<
JCCompilationUnit
>
parsedFiles
=
sourcesToParsedFiles
(
compiler
);
roots
=
cleanTrees
(
roots
).
reverse
();
roots
=
cleanTrees
(
roots
).
appendList
(
parsedFiles
);
for
(
JCCompilationUnit
unit
:
parsedFiles
)
roots
=
roots
.
prepend
(
unit
);
roots
=
roots
.
reverse
();
// Check for errors after parsing
// Check for errors after parsing
if
(
compiler
.
parseErrors
())
{
if
(
compiler
.
parseErrors
())
{
...
@@ -921,11 +910,16 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
...
@@ -921,11 +910,16 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
break
runAround
;
// No new files
break
runAround
;
// No new files
}
}
}
}
runLastRound
(
xout
,
roundNumber
,
errorStatus
,
taskListener
);
roots
=
runLastRound
(
xout
,
roundNumber
,
errorStatus
,
compiler
,
roots
,
taskListener
);
// Set error status for any files compiled and generated in
// the last round
if
(
compiler
.
parseErrors
())
errorStatus
=
true
;
compiler
.
close
(
false
);
compiler
.
close
(
false
);
currentContext
=
contextForNextRound
(
currentContext
,
true
);
currentContext
=
contextForNextRound
(
currentContext
,
true
);
compiler
=
JavaCompiler
.
instance
(
currentContext
);
compiler
=
JavaCompiler
.
instance
(
currentContext
);
filer
.
newRound
(
currentContext
,
true
);
filer
.
newRound
(
currentContext
,
true
);
filer
.
warnIfUnclosedFiles
();
filer
.
warnIfUnclosedFiles
();
warnIfUnmatchedOptions
();
warnIfUnmatchedOptions
();
...
@@ -979,10 +973,22 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
...
@@ -979,10 +973,22 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
return
compiler
;
return
compiler
;
}
}
private
List
<
JCCompilationUnit
>
sourcesToParsedFiles
(
JavaCompiler
compiler
)
throws
IOException
{
List
<
JavaFileObject
>
fileObjects
=
List
.
nil
();
for
(
JavaFileObject
jfo
:
filer
.
getGeneratedSourceFileObjects
()
)
{
fileObjects
=
fileObjects
.
prepend
(
jfo
);
}
return
compiler
.
parseFiles
(
fileObjects
);
}
// Call the last round of annotation processing
// Call the last round of annotation processing
private
void
runLastRound
(
PrintWriter
xout
,
private
List
<
JCCompilationUnit
>
runLastRound
(
PrintWriter
xout
,
int
roundNumber
,
int
roundNumber
,
boolean
errorStatus
,
boolean
errorStatus
,
JavaCompiler
compiler
,
List
<
JCCompilationUnit
>
roots
,
TaskListener
taskListener
)
throws
IOException
{
TaskListener
taskListener
)
throws
IOException
{
roundNumber
++;
roundNumber
++;
List
<
ClassSymbol
>
noTopLevelClasses
=
List
.
nil
();
List
<
ClassSymbol
>
noTopLevelClasses
=
List
.
nil
();
...
@@ -1003,6 +1009,15 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
...
@@ -1003,6 +1009,15 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
if
(
taskListener
!=
null
)
if
(
taskListener
!=
null
)
taskListener
.
finished
(
new
TaskEvent
(
TaskEvent
.
Kind
.
ANNOTATION_PROCESSING_ROUND
));
taskListener
.
finished
(
new
TaskEvent
(
TaskEvent
.
Kind
.
ANNOTATION_PROCESSING_ROUND
));
}
}
// Add any sources generated during the last round to the set
// of files to be compiled.
if
(
moreToDo
())
{
List
<
JCCompilationUnit
>
parsedFiles
=
sourcesToParsedFiles
(
compiler
);
roots
=
cleanTrees
(
roots
).
appendList
(
parsedFiles
);
}
return
roots
;
}
}
private
void
updateProcessingState
(
Context
currentContext
,
boolean
lastRound
)
{
private
void
updateProcessingState
(
Context
currentContext
,
boolean
lastRound
)
{
...
...
test/tools/javac/T6403466.java
浏览文件 @
6f6b3e67
...
@@ -41,7 +41,6 @@ import com.sun.tools.javac.api.JavacTool;
...
@@ -41,7 +41,6 @@ import com.sun.tools.javac.api.JavacTool;
@Wrap
@Wrap
@SupportedAnnotationTypes
(
"Wrap"
)
@SupportedAnnotationTypes
(
"Wrap"
)
@SupportedSourceVersion
(
SourceVersion
.
RELEASE_6
)
public
class
T6403466
extends
AbstractProcessor
{
public
class
T6403466
extends
AbstractProcessor
{
static
final
String
testSrcDir
=
System
.
getProperty
(
"test.src"
);
static
final
String
testSrcDir
=
System
.
getProperty
(
"test.src"
);
...
@@ -73,24 +72,31 @@ public class T6403466 extends AbstractProcessor {
...
@@ -73,24 +72,31 @@ public class T6403466 extends AbstractProcessor {
}
}
public
boolean
process
(
Set
<?
extends
TypeElement
>
annos
,
RoundEnvironment
rEnv
)
{
public
boolean
process
(
Set
<?
extends
TypeElement
>
annos
,
RoundEnvironment
rEnv
)
{
Filer
filer
=
processingEnv
.
getFiler
();
if
(!
rEnv
.
processingOver
())
{
for
(
TypeElement
anno:
annos
)
{
Filer
filer
=
processingEnv
.
getFiler
();
Set
<?
extends
Element
>
elts
=
rEnv
.
getElementsAnnotatedWith
(
anno
);
for
(
TypeElement
anno:
annos
)
{
System
.
err
.
println
(
"anno: "
+
anno
);
Set
<?
extends
Element
>
elts
=
rEnv
.
getElementsAnnotatedWith
(
anno
);
System
.
err
.
println
(
"elts: "
+
elts
);
System
.
err
.
println
(
"anno: "
+
anno
);
for
(
TypeElement
te:
ElementFilter
.
typesIn
(
elts
))
{
System
.
err
.
println
(
"elts: "
+
elts
);
try
{
for
(
TypeElement
te:
ElementFilter
.
typesIn
(
elts
))
{
Writer
out
=
filer
.
createSourceFile
(
te
.
getSimpleName
()
+
"Wrapper"
).
openWriter
();
try
{
out
.
write
(
"class "
+
te
.
getSimpleName
()
+
"Wrapper { }"
);
Writer
out
=
filer
.
createSourceFile
(
te
.
getSimpleName
()
+
"Wrapper"
).
openWriter
();
out
.
close
();
out
.
write
(
"class "
+
te
.
getSimpleName
()
+
"Wrapper { }"
);
}
catch
(
IOException
ex
)
{
out
.
close
();
ex
.
printStackTrace
();
}
catch
(
IOException
ex
)
{
ex
.
printStackTrace
();
}
}
}
}
}
}
}
return
true
;
return
true
;
}
}
@Override
public
SourceVersion
getSupportedSourceVersion
()
{
return
SourceVersion
.
latest
();
}
}
}
@Retention
(
RetentionPolicy
.
SOURCE
)
@Retention
(
RetentionPolicy
.
SOURCE
)
...
...
test/tools/javac/processing/6634138/Dummy.java
0 → 100644
浏览文件 @
6f6b3e67
/*
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/**
* A dummy class to be compiled.
*/
public
class
Dummy
{}
test/tools/javac/processing/6634138/ExerciseDependency.java
0 → 100644
浏览文件 @
6f6b3e67
/*
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/**
* Class to exercise dependencies on the two source files generated by
* T6634138.java, foo.WrittenAfterProcessing.java and
* foo.package-info.java.
*/
public
class
ExerciseDependency
{
public
static
void
main
(
String
...
args
)
{
foo
.
WrittenAfterProcessing
wap
=
new
foo
.
WrittenAfterProcessing
();
java
.
lang
.
Package
pkg
=
wap
.
getClass
().
getPackage
();
Deprecated
d
=
pkg
.
getAnnotation
(
Deprecated
.
class
);
if
(
d
==
null
)
throw
new
RuntimeException
();
}
}
test/tools/javac/processing/6634138/T6634138.java
0 → 100644
浏览文件 @
6f6b3e67
/*
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6634138
* @author Joseph D. Darcy
* @summary Verify source files output after processing is over are compiled
* @compile T6634138.java
* @compile -processor T6634138 Dummy.java
* @run main ExerciseDependency
*/
import
java.lang.annotation.Annotation
;
import
java.io.*
;
import
java.util.Collections
;
import
java.util.Set
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
javax.annotation.processing.*
;
import
javax.lang.model.SourceVersion
;
import
javax.lang.model.element.*
;
import
javax.lang.model.util.*
;
@SupportedAnnotationTypes
(
"*"
)
public
class
T6634138
extends
AbstractProcessor
{
private
Filer
filer
;
public
boolean
process
(
Set
<?
extends
TypeElement
>
annotations
,
RoundEnvironment
roundEnvironment
)
{
// Write out files *after* processing is over.
if
(
roundEnvironment
.
processingOver
())
{
System
.
out
.
println
(
"Writing out source files."
);
try
{
PrintWriter
pw
=
new
PrintWriter
(
filer
.
createSourceFile
(
"foo.WrittenAfterProcessing"
).
openWriter
());
try
{
pw
.
println
(
"package foo;"
);
pw
.
println
(
"public class WrittenAfterProcessing {"
);
pw
.
println
(
" public WrittenAfterProcessing() {super();}"
);
pw
.
println
(
"}"
);
}
finally
{
pw
.
close
();
}
pw
=
new
PrintWriter
(
filer
.
createSourceFile
(
"foo.package-info"
).
openWriter
());
try
{
pw
.
println
(
"@Deprecated"
);
pw
.
println
(
"package foo;"
);
}
finally
{
pw
.
close
();
}
}
catch
(
IOException
io
)
{
throw
new
RuntimeException
(
io
);
}
}
return
true
;
}
@Override
public
SourceVersion
getSupportedSourceVersion
()
{
return
SourceVersion
.
latest
();
}
public
void
init
(
ProcessingEnvironment
processingEnv
)
{
super
.
init
(
processingEnv
);
filer
=
processingEnv
.
getFiler
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录