Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
27a1a17c
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,发现更多精彩内容 >>
提交
27a1a17c
编写于
10月 13, 2015
作者:
M
Michael Bogdanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Deprecate non-const properties copies in interface
上级
dbc0197a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
17 addition
and
9 deletion
+17
-9
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
...ler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+6
-3
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
...g/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+2
-1
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/Test.java
...en/boxWithJava/properties/classObjectProperties/Test.java
+4
-1
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt
...properties/classObjectProperties/classObjectProperties.kt
+2
-1
compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt
...writeFlags/property/classObject/trait/internalConstVal.kt
+1
-1
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
...Data/writeFlags/property/classObject/trait/internalVal.kt
+1
-1
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
...stData/writeFlags/property/classObject/trait/publicVal.kt
+1
-1
未找到文件。
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
浏览文件 @
27a1a17c
...
@@ -786,10 +786,13 @@ public class AsmUtil {
...
@@ -786,10 +786,13 @@ public class AsmUtil {
}
}
public
static
boolean
isPropertyWithBackingFieldCopyInOuterClass
(
@NotNull
PropertyDescriptor
propertyDescriptor
)
{
public
static
boolean
isPropertyWithBackingFieldCopyInOuterClass
(
@NotNull
PropertyDescriptor
propertyDescriptor
)
{
boolean
isExtensionProperty
=
propertyDescriptor
.
getExtensionReceiverParameter
()
!=
null
;
DeclarationDescriptor
propertyContainer
=
propertyDescriptor
.
getContainingDeclaration
();
DeclarationDescriptor
propertyContainer
=
propertyDescriptor
.
getContainingDeclaration
();
return
propertyDescriptor
.
isConst
()
return
!
propertyDescriptor
.
isVar
()
&&
isInterfaceCompanionObject
(
propertyContainer
)
&&
!
isExtensionProperty
&&
propertyDescriptor
.
getVisibility
()
==
Visibilities
.
PUBLIC
;
&&
isCompanionObject
(
propertyContainer
)
&&
isInterface
(
propertyContainer
.
getContainingDeclaration
())
&&
areBothAccessorDefault
(
propertyDescriptor
)
&&
getVisibilityForSpecialPropertyBackingField
(
propertyDescriptor
,
false
)
==
ACC_PUBLIC
;
}
}
public
static
boolean
isCompanionObjectWithBackingFieldsInOuter
(
@NotNull
DeclarationDescriptor
companionObject
)
{
public
static
boolean
isCompanionObjectWithBackingFieldsInOuter
(
@NotNull
DeclarationDescriptor
companionObject
)
{
...
...
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
浏览文件 @
27a1a17c
...
@@ -1024,8 +1024,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
...
@@ -1024,8 +1024,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
PropertyDescriptor
property
=
info
.
descriptor
;
PropertyDescriptor
property
=
info
.
descriptor
;
Type
type
=
typeMapper
.
mapType
(
property
);
Type
type
=
typeMapper
.
mapType
(
property
);
int
modifiers
=
ACC_STATIC
|
ACC_FINAL
|
ACC_PUBLIC
|
(
property
.
isConst
()
?
0
:
ACC_DEPRECATED
);
FieldVisitor
fv
=
v
.
newField
(
Synthetic
(
DescriptorToSourceUtils
.
descriptorToDeclaration
(
property
),
property
),
FieldVisitor
fv
=
v
.
newField
(
Synthetic
(
DescriptorToSourceUtils
.
descriptorToDeclaration
(
property
),
property
),
ACC_STATIC
|
ACC_FINAL
|
ACC_PUBLIC
,
context
.
getFieldName
(
property
,
false
),
modifiers
,
context
.
getFieldName
(
property
,
false
),
type
.
getDescriptor
(),
typeMapper
.
mapFieldSignature
(
property
.
getType
()),
type
.
getDescriptor
(),
typeMapper
.
mapFieldSignature
(
property
.
getType
()),
info
.
defaultValue
);
info
.
defaultValue
);
...
...
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/Test.java
浏览文件 @
27a1a17c
...
@@ -8,8 +8,11 @@ class Test {
...
@@ -8,8 +8,11 @@ class Test {
s
=
Trait
.
NAME
;
s
=
Trait
.
NAME
;
if
(!
s
.
equals
(
"Trait"
))
throw
new
AssertionError
(
"Fail interface: "
+
s
);
if
(!
s
.
equals
(
"Trait"
))
throw
new
AssertionError
(
"Fail interface: "
+
s
);
s
=
Trait
.
DEPRECATED
;
if
(!
s
.
equals
(
"DEPRECATED"
))
throw
new
AssertionError
(
"Fail interface: "
+
s
);
s
=
Enoom
.
NAME
;
s
=
Enoom
.
NAME
;
if
(!
s
.
equals
(
"En
oo
m"
))
throw
new
AssertionError
(
"Fail enum: "
+
s
);
if
(!
s
.
equals
(
"En
u
m"
))
throw
new
AssertionError
(
"Fail enum: "
+
s
);
return
"OK"
;
return
"OK"
;
}
}
...
...
compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt
浏览文件 @
27a1a17c
...
@@ -7,13 +7,14 @@ class Klass {
...
@@ -7,13 +7,14 @@ class Klass {
interface
Trait
{
interface
Trait
{
companion
object
{
companion
object
{
const
val
NAME
=
"Trait"
const
val
NAME
=
"Trait"
val
DEPRECATED
=
"DEPRECATED"
}
}
}
}
enum
class
Enoom
{
enum
class
Enoom
{
;
;
companion
object
{
companion
object
{
const
val
NAME
=
"En
oo
m"
const
val
NAME
=
"En
u
m"
}
}
}
}
...
...
compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt
浏览文件 @
27a1a17c
...
@@ -6,7 +6,7 @@ interface Test {
...
@@ -6,7 +6,7 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// TESTED_OBJECTS: Test, prop
//
ABSENT: TRUE
//
FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// TESTED_OBJECTS: Test$Companion, prop
...
...
compiler/testData/writeFlags/property/classObject/trait/internalVal.kt
浏览文件 @
27a1a17c
...
@@ -6,7 +6,7 @@ interface Test {
...
@@ -6,7 +6,7 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// TESTED_OBJECTS: Test, prop
//
ABSENT: TRUE
//
FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// TESTED_OBJECTS: Test$Companion, prop
...
...
compiler/testData/writeFlags/property/classObject/trait/publicVal.kt
浏览文件 @
27a1a17c
...
@@ -6,7 +6,7 @@ interface Test {
...
@@ -6,7 +6,7 @@ interface Test {
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test, prop
// TESTED_OBJECTS: Test, prop
//
ABSENT: TRUE
//
FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_DEPRECATED
// TESTED_OBJECT_KIND: property
// TESTED_OBJECT_KIND: property
// TESTED_OBJECTS: Test$Companion, prop
// TESTED_OBJECTS: Test$Companion, prop
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录