Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
ef825a75
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ef825a75
编写于
12月 20, 2016
作者:
M
Mikhael Bogdanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for KT-14868: CCE in runtime while converting Number to Char
#KT-14868 Fixed
上级
ce333b0a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
36 addition
and
2 deletion
+36
-2
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
.../backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+3
-2
compiler/testData/codegen/box/primitiveTypes/kt14868.kt
compiler/testData/codegen/box/primitiveTypes/kt14868.kt
+6
-0
compiler/testData/codegen/light-analysis/primitiveTypes/kt14868.txt
...estData/codegen/light-analysis/primitiveTypes/kt14868.txt
+3
-0
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
...ins/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+6
-0
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
...etbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+6
-0
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
...kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
+6
-0
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
...s/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+6
-0
未找到文件。
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
浏览文件 @
ef825a75
...
...
@@ -405,11 +405,12 @@ public abstract class StackValue {
coerce
(
unboxedType
,
toType
,
v
);
}
else
{
if
(
toType
.
getSort
()
==
Type
.
BOOLEAN
||
toType
.
getSort
()
==
Type
.
CHAR
)
{
Type
numberType
=
getType
(
Number
.
class
);
if
(
toType
.
getSort
()
==
Type
.
BOOLEAN
||
(
toType
.
getSort
()
==
Type
.
CHAR
&&
!
numberType
.
equals
(
fromType
)))
{
coerce
(
fromType
,
boxType
(
toType
),
v
);
}
else
{
coerce
(
fromType
,
getType
(
Number
.
class
)
,
v
);
coerce
(
fromType
,
numberType
,
v
);
}
unbox
(
toType
,
v
);
}
...
...
compiler/testData/codegen/box/primitiveTypes/kt14868.kt
0 → 100644
浏览文件 @
ef825a75
fun
box
():
String
{
val
x
:
Number
=
75
return
"O"
+
x
.
toChar
()
}
\ No newline at end of file
compiler/testData/codegen/light-analysis/primitiveTypes/kt14868.txt
0 → 100644
浏览文件 @
ef825a75
public final class Kt14868Kt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
浏览文件 @
ef825a75
...
...
@@ -10958,6 +10958,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
@TestMetadata("kt14868.kt")
public void testKt14868() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt14868.kt");
doTest(fileName);
}
@TestMetadata("kt1508.kt")
public void testKt1508() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
...
...
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
浏览文件 @
ef825a75
...
...
@@ -10958,6 +10958,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("kt14868.kt")
public void testKt14868() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt14868.kt");
doTest(fileName);
}
@TestMetadata("kt1508.kt")
public void testKt1508() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
...
...
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
浏览文件 @
ef825a75
...
...
@@ -10958,6 +10958,12 @@ public class LightAnalysisModeCodegenTestGenerated extends AbstractLightAnalysis
doTest(fileName);
}
@TestMetadata("kt14868.kt")
public void testKt14868() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt14868.kt");
doTest(fileName);
}
@TestMetadata("kt1508.kt")
public void testKt1508() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
...
...
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
浏览文件 @
ef825a75
...
...
@@ -12849,6 +12849,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
doTest(fileName);
}
@TestMetadata("kt14868.kt")
public void testKt14868() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt14868.kt");
doTest(fileName);
}
@TestMetadata("kt1508.kt")
public void testKt1508() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录