From cdcb651c8e2ef49434e1c4e74676c75d72cb8bdd Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 2 Mar 2018 12:45:49 +0100
Subject: [PATCH] Get rid of 'BRIDGE' flag on $default functions

---
 .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java       | 2 +-
 .../writeFlags/function/withDefaultArguments/funInClass.kt      | 2 +-
 .../function/withDefaultArguments/funInClassObject.kt           | 2 +-
 .../function/withDefaultArguments/inlineOnlyFunInClass.kt       | 2 +-
 .../function/withDefaultArguments/reifiedFunInClass.kt          | 2 +-
 .../writeFlags/function/withDefaultArguments/topLevelFun.kt     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
index 060005a8d6e..d6954850b85 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
@@ -1086,7 +1086,7 @@ public class FunctionCodegen {
                              AsmUtil.NO_FLAG_PACKAGE_PRIVATE : Opcodes.ACC_PUBLIC;
         int flags =  visibilityFlag | getDeprecatedAccessFlag(functionDescriptor) | ACC_SYNTHETIC;
         if (!(functionDescriptor instanceof ConstructorDescriptor)) {
-            flags |= ACC_STATIC | ACC_BRIDGE;
+            flags |= ACC_STATIC;
         }
 
         Method defaultMethod = typeMapper.mapDefaultMethod(functionDescriptor, kind);
diff --git a/compiler/testData/writeFlags/function/withDefaultArguments/funInClass.kt b/compiler/testData/writeFlags/function/withDefaultArguments/funInClass.kt
index 4bbadfb4483..df31e2d9afa 100644
--- a/compiler/testData/writeFlags/function/withDefaultArguments/funInClass.kt
+++ b/compiler/testData/writeFlags/function/withDefaultArguments/funInClass.kt
@@ -4,4 +4,4 @@ class MyClass() {
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: MyClass, test$default
-// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC
+// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
diff --git a/compiler/testData/writeFlags/function/withDefaultArguments/funInClassObject.kt b/compiler/testData/writeFlags/function/withDefaultArguments/funInClassObject.kt
index 86126468c3f..57b80e3fb37 100644
--- a/compiler/testData/writeFlags/function/withDefaultArguments/funInClassObject.kt
+++ b/compiler/testData/writeFlags/function/withDefaultArguments/funInClassObject.kt
@@ -6,4 +6,4 @@ class MyClass() {
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: MyClass$Companion, test$default
-// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC
+// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
diff --git a/compiler/testData/writeFlags/function/withDefaultArguments/inlineOnlyFunInClass.kt b/compiler/testData/writeFlags/function/withDefaultArguments/inlineOnlyFunInClass.kt
index 9d64aacab0e..5a7d777311f 100644
--- a/compiler/testData/writeFlags/function/withDefaultArguments/inlineOnlyFunInClass.kt
+++ b/compiler/testData/writeFlags/function/withDefaultArguments/inlineOnlyFunInClass.kt
@@ -7,4 +7,4 @@ class MyClass() {
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: MyClass, test$default
-// FLAGS: ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC
+// FLAGS: ACC_STATIC, ACC_SYNTHETIC
diff --git a/compiler/testData/writeFlags/function/withDefaultArguments/reifiedFunInClass.kt b/compiler/testData/writeFlags/function/withDefaultArguments/reifiedFunInClass.kt
index 362f7424265..4439b2d2a40 100644
--- a/compiler/testData/writeFlags/function/withDefaultArguments/reifiedFunInClass.kt
+++ b/compiler/testData/writeFlags/function/withDefaultArguments/reifiedFunInClass.kt
@@ -4,4 +4,4 @@ class MyClass() {
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: MyClass, test$default
-// FLAGS: ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC
+// FLAGS: ACC_STATIC, ACC_SYNTHETIC
diff --git a/compiler/testData/writeFlags/function/withDefaultArguments/topLevelFun.kt b/compiler/testData/writeFlags/function/withDefaultArguments/topLevelFun.kt
index 1672055c51b..6385ae7fc34 100644
--- a/compiler/testData/writeFlags/function/withDefaultArguments/topLevelFun.kt
+++ b/compiler/testData/writeFlags/function/withDefaultArguments/topLevelFun.kt
@@ -2,4 +2,4 @@ fun test(s: String = "") {}
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: TopLevelFunKt, test$default
-// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_BRIDGE, ACC_SYNTHETIC
+// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC