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

Fix tests after rebase

Browse Source
This commit is contained in:
Dmitry Petrov
2018-08-30 18:00:41 +03:00
parent 1bf8cfca8b
commit 65881dda97
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public final class Foo$Companion {
}
@kotlin.Metadata
public static class Foo$Erased {
static class Foo$Erased {
method <init>(): void
public final static @org.jetbrains.annotations.NotNull method box(p0: int): Foo
public static method constructor(p0: int): int
compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
@kotlin.Metadata
public static class Foo$Erased {
static class Foo$Erased {
method <init>(): void
public final static @org.jetbrains.annotations.NotNull method box(p0: int): Foo
public static method constructor(p0: int): int
compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public interface A {
}
@kotlin.Metadata
public static class Foo$Erased {
static class Foo$Erased {
method <init>(): void
public final static @org.jetbrains.annotations.NotNull method box(p0: long): Foo
public static method constructor(p0: long): long
compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
@kotlin.Metadata
public static class Foo$Erased {
static class Foo$Erased {
method <init>(): void
public final static @org.jetbrains.annotations.NotNull method box(p0: long): Foo
public static method constructor(p0: long): long
compiler/testData/codegen/bytecodeText/boxingOptimization/boxingAndEquals.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun getAndCheckInlinedInt(a: InlinedInt, b: InlinedInt) =
// 0 valueOf
// 0 Value
// 1 areEqual
// 2 INVOKESTATIC InlinedInt\$Erased.box
// 2 INVOKESTATIC InlinedInt\.box
// 0 INVOKEVIRTUAL InlinedInt.unbox
// FILE: Inline.kt
compiler/testData/codegen/bytecodeText/inlineClasses/synthesizedBoxMethodIsNotMangled.kt
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@ fun test(zs: MutableList<Z2>, z: Z2) {
}
// 1 public final static box\(I\)LZ2;
// 1 INVOKESTATIC Z2\$Erased.box \(I\)LZ2;
// 1 INVOKESTATIC Z2\.box \(I\)LZ2;
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
Generated
+13 -8
View File
@@ -2068,9 +2068,9 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/constructorWithInlineClassParametersIsNotMangled.kt");
}
@TestMetadata("functionsWithInlineClassParametersHaveStableMangledNames.kt")
public void testFunctionsWithInlineClassParametersHaveStableMangledNames() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt");
@TestMetadata("equalsIsCalledByInlineClass.kt")
public void testEqualsIsCalledByInlineClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/equalsIsCalledByInlineClass.kt");
}
@TestMetadata("factoryMethodForSecondaryConstructorsCalledByInlineClass.kt")
@@ -2078,6 +2078,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/factoryMethodForSecondaryConstructorsCalledByInlineClass.kt");
}
@TestMetadata("functionsWithInlineClassParametersHaveStableMangledNames.kt")
public void testFunctionsWithInlineClassParametersHaveStableMangledNames() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/functionsWithInlineClassParametersHaveStableMangledNames.kt");
}
@TestMetadata("generationOfAccessorToUnderlyingValue.kt")
public void testGenerationOfAccessorToUnderlyingValue() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/generationOfAccessorToUnderlyingValue.kt");
@@ -2153,11 +2158,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/passInlineClassesWithSpreadOperatorToVarargs.kt");
}
@TestMetadata("propertySetterWithInlineClassTypeArgument.kt")
public void testPropertySetterWithInlineClassTypeArgument() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/propertySetterWithInlineClassTypeArgument.kt");
}
@TestMetadata("primaryConstructorCalledByInlineClass.kt")
public void testPrimaryConstructorCalledByInlineClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/primaryConstructorCalledByInlineClass.kt");
@@ -2168,6 +2168,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/propertyAccessorsAreCalledByInlineClass.kt");
}
@TestMetadata("propertySetterWithInlineClassTypeArgument.kt")
public void testPropertySetterWithInlineClassTypeArgument() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/propertySetterWithInlineClassTypeArgument.kt");
}
@TestMetadata("skipCallToUnderlyingValueOfInlineClass.kt")
public void testSkipCallToUnderlyingValueOfInlineClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/skipCallToUnderlyingValueOfInlineClass.kt");