azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of 'BRIDGE' flag on $default functions

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-03-02 12:45:49 +01:00
parent ac5ef57876
commit cdcb651c8e
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+1 -1
View File
@@ -1086,7 +1086,7 @@ public class FunctionCodegen {
AsmUtil.NO_FLAG_PACKAGE_PRIVATE : Opcodes.ACC_PUBLIC; AsmUtil.NO_FLAG_PACKAGE_PRIVATE : Opcodes.ACC_PUBLIC;
int flags = visibilityFlag | getDeprecatedAccessFlag(functionDescriptor) | ACC_SYNTHETIC; int flags = visibilityFlag | getDeprecatedAccessFlag(functionDescriptor) | ACC_SYNTHETIC;
if (!(functionDescriptor instanceof ConstructorDescriptor)) { if (!(functionDescriptor instanceof ConstructorDescriptor)) {
flags |= ACC_STATIC | ACC_BRIDGE; flags |= ACC_STATIC;
} }
Method defaultMethod = typeMapper.mapDefaultMethod(functionDescriptor, kind); Method defaultMethod = typeMapper.mapDefaultMethod(functionDescriptor, kind);
compiler/testData/writeFlags/function/withDefaultArguments/funInClass.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ class MyClass() {
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, test$default // TESTED_OBJECTS: MyClass, test$default
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/function/withDefaultArguments/funInClassObject.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ class MyClass() {
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass$Companion, test$default // TESTED_OBJECTS: MyClass$Companion, test$default
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/function/withDefaultArguments/inlineOnlyFunInClass.kt
Vendored
+1 -1
View File
@@ -7,4 +7,4 @@ class MyClass() {
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, test$default // TESTED_OBJECTS: MyClass, test$default
// FLAGS: ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC // FLAGS: ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/function/withDefaultArguments/reifiedFunInClass.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ class MyClass() {
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: MyClass, test$default // TESTED_OBJECTS: MyClass, test$default
// FLAGS: ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC // FLAGS: ACC_STATIC, ACC_SYNTHETIC
compiler/testData/writeFlags/function/withDefaultArguments/topLevelFun.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ fun test(s: String = "") {}
// TESTED_OBJECT_KIND: function // TESTED_OBJECT_KIND: function
// TESTED_OBJECTS: TopLevelFunKt, test$default // TESTED_OBJECTS: TopLevelFunKt, test$default
// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC