Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
8e223585
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看板
提交
8e223585
编写于
6月 27, 2013
作者:
V
vromero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7008643: inlined finally clauses confuse debuggers
Reviewed-by: jjg
上级
5cb4d34f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
126 addition
and
0 deletion
+126
-0
src/share/classes/com/sun/tools/javac/jvm/Gen.java
src/share/classes/com/sun/tools/javac/jvm/Gen.java
+9
-0
test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
...ls/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
+117
-0
未找到文件。
src/share/classes/com/sun/tools/javac/jvm/Gen.java
浏览文件 @
8e223585
...
...
@@ -1783,7 +1783,16 @@ public class Gen extends JCTree.Visitor {
r
.
load
();
code
.
emitop0
(
ireturn
+
Code
.
truncate
(
Code
.
typecode
(
pt
)));
}
else
{
/* If we have a statement like:
*
* return;
*
* we need to store the code.pendingStatPos value before generating
* the finalizer.
*/
int
tmpPos
=
code
.
pendingStatPos
;
targetEnv
=
unwind
(
env
.
enclMethod
,
env
);
code
.
pendingStatPos
=
tmpPos
;
code
.
emitop0
(
return_
);
}
endFinalizerGaps
(
env
,
targetEnv
);
...
...
test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
0 → 100644
浏览文件 @
8e223585
/*
* Copyright (c) 2013, 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 7008643
* @summary inlined finally clauses confuse debuggers
* @library /tools/javac/lib
* @build ToolBox
* @run main InlinedFinallyConfuseDebuggersTest
*/
import
java.io.File
;
import
java.nio.file.Paths
;
import
com.sun.tools.classfile.ClassFile
;
import
com.sun.tools.classfile.Code_attribute
;
import
com.sun.tools.classfile.LineNumberTable_attribute
;
import
com.sun.tools.classfile.Method
;
import
com.sun.tools.javac.util.Assert
;
public
class
InlinedFinallyConfuseDebuggersTest
{
static
final
String
testSource
=
/* 01 */
"public class InlinedFinallyTest {\n"
+
/* 02 */
" void lookForThisMethod(int value) {\n"
+
/* 03 */
" try {\n"
+
/* 04 */
" if (value > 0) {\n"
+
/* 05 */
" System.out.println(\"if\");\n"
+
/* 06 */
" return;\n"
+
/* 07 */
" }\n"
+
/* 08 */
" } finally {\n"
+
/* 09 */
" System.out.println(\"finally\");\n"
+
/* 10 */
" }\n"
+
/* 11 */
" }\n"
+
/* 12 */
"}"
;
static
final
int
[][]
expectedLNT
=
{
// {line-number, start-pc},
{
4
,
0
},
//if (value > 0) {
{
5
,
4
},
// System.out.println("if");
{
9
,
12
},
//System.out.println("finally");
{
6
,
20
},
// return;
{
9
,
21
},
//System.out.println("finally");
{
10
,
29
},
{
9
,
32
},
//System.out.println("finally");
{
11
,
43
},
};
static
final
String
methodToLookFor
=
"lookForThisMethod"
;
public
static
void
main
(
String
[]
args
)
throws
Exception
{
new
InlinedFinallyConfuseDebuggersTest
().
run
();
}
void
run
()
throws
Exception
{
compileTestClass
();
checkClassFile
(
new
File
(
Paths
.
get
(
System
.
getProperty
(
"user.dir"
),
"InlinedFinallyTest.class"
).
toUri
()),
methodToLookFor
);
}
void
compileTestClass
()
throws
Exception
{
ToolBox
.
JavaToolArgs
javacSuccessArgs
=
new
ToolBox
.
JavaToolArgs
().
setSources
(
testSource
);
ToolBox
.
javac
(
javacSuccessArgs
);
}
void
checkClassFile
(
final
File
cfile
,
String
methodToFind
)
throws
Exception
{
ClassFile
classFile
=
ClassFile
.
read
(
cfile
);
boolean
methodFound
=
false
;
for
(
Method
method
:
classFile
.
methods
)
{
if
(
method
.
getName
(
classFile
.
constant_pool
).
equals
(
methodToFind
))
{
methodFound
=
true
;
Code_attribute
code
=
(
Code_attribute
)
method
.
attributes
.
get
(
"Code"
);
LineNumberTable_attribute
lnt
=
(
LineNumberTable_attribute
)
code
.
attributes
.
get
(
"LineNumberTable"
);
Assert
.
check
(
lnt
.
line_number_table_length
==
expectedLNT
.
length
,
"The LineNumberTable found has a length different to the expected one"
);
int
i
=
0
;
for
(
LineNumberTable_attribute
.
Entry
entry:
lnt
.
line_number_table
)
{
Assert
.
check
(
entry
.
line_number
==
expectedLNT
[
i
][
0
]
&&
entry
.
start_pc
==
expectedLNT
[
i
][
1
],
"LNT entry at pos "
+
i
+
" differ from expected."
+
"Found "
+
entry
.
line_number
+
":"
+
entry
.
start_pc
+
". Expected "
+
expectedLNT
[
i
][
0
]
+
":"
+
expectedLNT
[
i
][
1
]);
i
++;
}
}
}
Assert
.
check
(
methodFound
,
"The seek method was not found"
);
}
void
error
(
String
msg
)
{
throw
new
AssertionError
(
msg
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录