diff options
131 files changed, 1856 insertions, 2883 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 8d60be20ee..cf836a9c9f 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -220,8 +220,7 @@ void JniCompilerTest::CompileAndRunIntMethodThroughStubImpl() { std::string reason; ASSERT_TRUE(Runtime::Current()->GetJavaVM()-> - LoadNativeLibrary(env_, "", class_loader_, /* is_shared_namespace */ false, - nullptr, nullptr, &reason)) + LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason)) << reason; jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24); @@ -236,8 +235,7 @@ void JniCompilerTest::CompileAndRunStaticIntMethodThroughStubImpl() { std::string reason; ASSERT_TRUE(Runtime::Current()->GetJavaVM()-> - LoadNativeLibrary(env_, "", class_loader_, /* is_shared_namespace */ false, - nullptr, nullptr, &reason)) + LoadNativeLibrary(env_, "", class_loader_, nullptr, &reason)) << reason; jint result = env_->CallStaticIntMethod(jklass_, jmethod_, 42); diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc index 7a4a6ef266..cc757ab8b5 100644 --- a/compiler/optimizing/intrinsics_arm64.cc +++ b/compiler/optimizing/intrinsics_arm64.cc @@ -46,6 +46,7 @@ using helpers::RegisterFrom; using helpers::SRegisterFrom; using helpers::WRegisterFrom; using helpers::XRegisterFrom; +using helpers::InputRegisterAt; namespace { @@ -367,6 +368,40 @@ void IntrinsicCodeGeneratorARM64::VisitLongReverse(HInvoke* invoke) { GenReverse(invoke->GetLocations(), Primitive::kPrimLong, GetVIXLAssembler()); } +static void GenBitCount(HInvoke* instr, bool is_long, vixl::MacroAssembler* masm) { + DCHECK(instr->GetType() == Primitive::kPrimInt); + DCHECK((is_long && instr->InputAt(0)->GetType() == Primitive::kPrimLong) || + (!is_long && instr->InputAt(0)->GetType() == Primitive::kPrimInt)); + + Location out = instr->GetLocations()->Out(); + UseScratchRegisterScope temps(masm); + + Register src = InputRegisterAt(instr, 0); + Register dst = is_long ? XRegisterFrom(out) : WRegisterFrom(out); + FPRegister fpr = is_long ? temps.AcquireD() : temps.AcquireS(); + + __ Fmov(fpr, src); + __ Cnt(fpr.V8B(), fpr.V8B()); + __ Addv(fpr.B(), fpr.V8B()); + __ Fmov(dst, fpr); +} + +void IntrinsicLocationsBuilderARM64::VisitLongBitCount(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorARM64::VisitLongBitCount(HInvoke* invoke) { + GenBitCount(invoke, /* is_long */ true, GetVIXLAssembler()); +} + +void IntrinsicLocationsBuilderARM64::VisitIntegerBitCount(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorARM64::VisitIntegerBitCount(HInvoke* invoke) { + GenBitCount(invoke, /* is_long */ false, GetVIXLAssembler()); +} + static void CreateFPToFPLocations(ArenaAllocator* arena, HInvoke* invoke) { LocationSummary* locations = new (arena) LocationSummary(invoke, LocationSummary::kNoCall, @@ -1672,8 +1707,6 @@ void IntrinsicCodeGeneratorARM64::VisitStringGetCharsNoCheck(HInvoke* invoke) { __ Bind(&done); } -UNIMPLEMENTED_INTRINSIC(ARM64, IntegerBitCount) -UNIMPLEMENTED_INTRINSIC(ARM64, LongBitCount) UNIMPLEMENTED_INTRINSIC(ARM64, SystemArrayCopyChar) UNIMPLEMENTED_INTRINSIC(ARM64, SystemArrayCopy) UNIMPLEMENTED_INTRINSIC(ARM64, ReferenceGetReferent) diff --git a/compiler/optimizing/intrinsics_mips.cc b/compiler/optimizing/intrinsics_mips.cc index 5a35dd57a4..710df0a822 100644 --- a/compiler/optimizing/intrinsics_mips.cc +++ b/compiler/optimizing/intrinsics_mips.cc @@ -490,7 +490,6 @@ void IntrinsicCodeGeneratorMIPS::VisitLongNumberOfLeadingZeros(HInvoke* invoke) static void GenNumberOfTrailingZeroes(LocationSummary* locations, bool is64bit, bool isR6, - bool isR2OrNewer, MipsAssembler* assembler) { Register out = locations->Out().AsRegister<Register>(); Register in_lo; @@ -503,7 +502,7 @@ static void GenNumberOfTrailingZeroes(LocationSummary* locations, // If in_lo is zero then count the number of trailing zeroes in in_hi; // otherwise count the number of trailing zeroes in in_lo. - // AT = in_lo ? in_lo : in_hi; + // out = in_lo ? in_lo : in_hi; if (isR6) { __ Seleqz(out, in_hi, in_lo); __ Selnez(TMP, in_lo, in_lo); @@ -522,50 +521,26 @@ static void GenNumberOfTrailingZeroes(LocationSummary* locations, in_lo = in; } - // We don't have an instruction to count the number of trailing zeroes. - // Start by flipping the bits end-for-end so we can count the number of - // leading zeroes instead. - if (isR2OrNewer) { + if (isR6) { + // We don't have an instruction to count the number of trailing zeroes. + // Start by flipping the bits end-for-end so we can count the number of + // leading zeroes instead. __ Rotr(out, in, 16); __ Wsbh(out, out); - } else { - // MIPS32r1 - // __ Rotr(out, in, 16); - __ Sll(TMP, in, 16); - __ Srl(out, in, 16); - __ Or(out, out, TMP); - // __ Wsbh(out, out); - __ LoadConst32(AT, 0x00FF00FF); - __ And(TMP, out, AT); - __ Sll(TMP, TMP, 8); - __ Srl(out, out, 8); - __ And(out, out, AT); - __ Or(out, out, TMP); - } - - if (isR6) { __ Bitswap(out, out); __ ClzR6(out, out); } else { - __ LoadConst32(AT, 0x0F0F0F0F); - __ And(TMP, out, AT); - __ Sll(TMP, TMP, 4); - __ Srl(out, out, 4); - __ And(out, out, AT); - __ Or(out, TMP, out); - __ LoadConst32(AT, 0x33333333); - __ And(TMP, out, AT); - __ Sll(TMP, TMP, 2); - __ Srl(out, out, 2); - __ And(out, out, AT); - __ Or(out, TMP, out); - __ LoadConst32(AT, 0x55555555); - __ And(TMP, out, AT); - __ Sll(TMP, TMP, 1); - __ Srl(out, out, 1); - __ And(out, out, AT); - __ Or(out, TMP, out); + // Convert trailing zeroes to trailing ones, and bits to their left + // to zeroes. + __ Addiu(TMP, in, -1); + __ Xor(out, TMP, in); + __ And(out, out, TMP); + // Count number of leading zeroes. __ ClzR2(out, out); + // Subtract number of leading zeroes from 32 to get number of trailing ones. + // Remember that the trailing ones were formerly trailing zeroes. + __ LoadConst32(TMP, 32); + __ Subu(out, TMP, out); } if (is64bit) { @@ -587,11 +562,7 @@ void IntrinsicLocationsBuilderMIPS::VisitIntegerNumberOfTrailingZeros(HInvoke* i } void IntrinsicCodeGeneratorMIPS::VisitIntegerNumberOfTrailingZeros(HInvoke* invoke) { - GenNumberOfTrailingZeroes(invoke->GetLocations(), - /* is64bit */ false, - IsR6(), - IsR2OrNewer(), - GetAssembler()); + GenNumberOfTrailingZeroes(invoke->GetLocations(), /* is64bit */ false, IsR6(), GetAssembler()); } // int java.lang.Long.numberOfTrailingZeros(long i) @@ -600,11 +571,7 @@ void IntrinsicLocationsBuilderMIPS::VisitLongNumberOfTrailingZeros(HInvoke* invo } void IntrinsicCodeGeneratorMIPS::VisitLongNumberOfTrailingZeros(HInvoke* invoke) { - GenNumberOfTrailingZeroes(invoke->GetLocations(), - /* is64bit */ true, - IsR6(), - IsR2OrNewer(), - GetAssembler()); + GenNumberOfTrailingZeroes(invoke->GetLocations(), /* is64bit */ true, IsR6(), GetAssembler()); } // int java.lang.Integer.reverse(int) @@ -643,6 +610,142 @@ static void CreateFPToFPLocations(ArenaAllocator* arena, HInvoke* invoke) { locations->SetOut(Location::RequiresFpuRegister(), Location::kNoOutputOverlap); } +static void GenBitCount(LocationSummary* locations, + Primitive::Type type, + bool isR6, + MipsAssembler* assembler) { + DCHECK(type == Primitive::kPrimInt || type == Primitive::kPrimLong); + + Register out = locations->Out().AsRegister<Register>(); + + // https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel + // + // A generalization of the best bit counting method to integers of + // bit-widths up to 128 (parameterized by type T) is this: + // + // v = v - ((v >> 1) & (T)~(T)0/3); // temp + // v = (v & (T)~(T)0/15*3) + ((v >> 2) & (T)~(T)0/15*3); // temp + // v = (v + (v >> 4)) & (T)~(T)0/255*15; // temp + // c = (T)(v * ((T)~(T)0/255)) >> (sizeof(T) - 1) * BITS_PER_BYTE; // count + // + // For comparison, for 32-bit quantities, this algorithm can be executed + // using 20 MIPS instructions (the calls to LoadConst32() generate two + // machine instructions each for the values being used in this algorithm). + // A(n unrolled) loop-based algorithm required 25 instructions. + // + // For 64-bit quantities, this algorithm gets executed twice, (once + // for in_lo, and again for in_hi), but saves a few instructions + // because the mask values only have to be loaded once. Using this + // algorithm the count for a 64-bit operand can be performed in 33 + // instructions compared to a loop-based algorithm which required 47 + // instructions. + + if (type == Primitive::kPrimInt) { + Register in = locations->InAt(0).AsRegister<Register>(); + + __ Srl(TMP, in, 1); + __ LoadConst32(AT, 0x55555555); + __ And(TMP, TMP, AT); + __ Subu(TMP, in, TMP); + __ LoadConst32(AT, 0x33333333); + __ And(out, TMP, AT); + __ Srl(TMP, TMP, 2); + __ And(TMP, TMP, AT); + __ Addu(TMP, out, TMP); + __ Srl(out, TMP, 4); + __ Addu(out, out, TMP); + __ LoadConst32(AT, 0x0F0F0F0F); + __ And(out, out, AT); + __ LoadConst32(TMP, 0x01010101); + if (isR6) { + __ MulR6(out, out, TMP); + } else { + __ MulR2(out, out, TMP); + } + __ Srl(out, out, 24); + } else if (type == Primitive::kPrimLong) { + Register in_lo = locations->InAt(0).AsRegisterPairLow<Register>(); + Register in_hi = locations->InAt(0).AsRegisterPairHigh<Register>(); + Register tmp_hi = locations->GetTemp(0).AsRegister<Register>(); + Register out_hi = locations->GetTemp(1).AsRegister<Register>(); + Register tmp_lo = TMP; + Register out_lo = out; + + __ Srl(tmp_lo, in_lo, 1); + __ Srl(tmp_hi, in_hi, 1); + + __ LoadConst32(AT, 0x55555555); + + __ And(tmp_lo, tmp_lo, AT); + __ Subu(tmp_lo, in_lo, tmp_lo); + + __ And(tmp_hi, tmp_hi, AT); + __ Subu(tmp_hi, in_hi, tmp_hi); + + __ LoadConst32(AT, 0x33333333); + + __ And(out_lo, tmp_lo, AT); + __ Srl(tmp_lo, tmp_lo, 2); + __ And(tmp_lo, tmp_lo, AT); + __ Addu(tmp_lo, out_lo, tmp_lo); + __ Srl(out_lo, tmp_lo, 4); + __ Addu(out_lo, out_lo, tmp_lo); + + __ And(out_hi, tmp_hi, AT); + __ Srl(tmp_hi, tmp_hi, 2); + __ And(tmp_hi, tmp_hi, AT); + __ Addu(tmp_hi, out_hi, tmp_hi); + __ Srl(out_hi, tmp_hi, 4); + __ Addu(out_hi, out_hi, tmp_hi); + + __ LoadConst32(AT, 0x0F0F0F0F); + + __ And(out_lo, out_lo, AT); + __ And(out_hi, out_hi, AT); + + __ LoadConst32(AT, 0x01010101); + + if (isR6) { + __ MulR6(out_lo, out_lo, AT); + + __ MulR6(out_hi, out_hi, AT); + } else { + __ MulR2(out_lo, out_lo, AT); + + __ MulR2(out_hi, out_hi, AT); + } + + __ Srl(out_lo, out_lo, 24); + __ Srl(out_hi, out_hi, 24); + + __ Addu(out, out_hi, out_lo); + } +} + +// int java.lang.Integer.bitCount(int) +void IntrinsicLocationsBuilderMIPS::VisitIntegerBitCount(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitIntegerBitCount(HInvoke* invoke) { + GenBitCount(invoke->GetLocations(), Primitive::kPrimInt, IsR6(), GetAssembler()); +} + +// int java.lang.Long.bitCount(int) +void IntrinsicLocationsBuilderMIPS::VisitLongBitCount(HInvoke* invoke) { + LocationSummary* locations = new (arena_) LocationSummary(invoke, + LocationSummary::kNoCall, + kIntrinsified); + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister()); + locations->AddTemp(Location::RequiresRegister()); + locations->AddTemp(Location::RequiresRegister()); +} + +void IntrinsicCodeGeneratorMIPS::VisitLongBitCount(HInvoke* invoke) { + GenBitCount(invoke->GetLocations(), Primitive::kPrimLong, IsR6(), GetAssembler()); +} + static void MathAbsFP(LocationSummary* locations, bool is64bit, MipsAssembler* assembler) { FRegister in = locations->InAt(0).AsFpuRegister<FRegister>(); FRegister out = locations->Out().AsFpuRegister<FRegister>(); @@ -1502,8 +1605,178 @@ void IntrinsicCodeGeneratorMIPS::VisitStringEquals(HInvoke* invoke) { __ Bind(&end); } -UNIMPLEMENTED_INTRINSIC(MIPS, IntegerBitCount) -UNIMPLEMENTED_INTRINSIC(MIPS, LongBitCount) +static void GenIsInfinite(LocationSummary* locations, + const Primitive::Type type, + const bool isR6, + MipsAssembler* assembler) { + FRegister in = locations->InAt(0).AsFpuRegister<FRegister>(); + Register out = locations->Out().AsRegister<Register>(); + + DCHECK(type == Primitive::kPrimFloat || type == Primitive::kPrimDouble); + + if (isR6) { + if (type == Primitive::kPrimDouble) { + __ ClassD(FTMP, in); + } else { + __ ClassS(FTMP, in); + } + __ Mfc1(out, FTMP); + __ Andi(out, out, kPositiveInfinity | kNegativeInfinity); + __ Sltu(out, ZERO, out); + } else { + // If one, or more, of the exponent bits is zero, then the number can't be infinite. + if (type == Primitive::kPrimDouble) { + __ MoveFromFpuHigh(TMP, in); + __ LoadConst32(AT, 0x7FF00000); + } else { + __ Mfc1(TMP, in); + __ LoadConst32(AT, 0x7F800000); + } + __ Xor(TMP, TMP, AT); + + __ Sll(TMP, TMP, 1); + + if (type == Primitive::kPrimDouble) { + __ Mfc1(AT, in); + __ Or(TMP, TMP, AT); + } + // If any of the significand bits are one, then the number is not infinite. + __ Sltiu(out, TMP, 1); + } +} + +// boolean java.lang.Float.isInfinite(float) +void IntrinsicLocationsBuilderMIPS::VisitFloatIsInfinite(HInvoke* invoke) { + CreateFPToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitFloatIsInfinite(HInvoke* invoke) { + GenIsInfinite(invoke->GetLocations(), Primitive::kPrimFloat, IsR6(), GetAssembler()); +} + +// boolean java.lang.Double.isInfinite(double) +void IntrinsicLocationsBuilderMIPS::VisitDoubleIsInfinite(HInvoke* invoke) { + CreateFPToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitDoubleIsInfinite(HInvoke* invoke) { + GenIsInfinite(invoke->GetLocations(), Primitive::kPrimDouble, IsR6(), GetAssembler()); +} + +static void GenHighestOneBit(LocationSummary* locations, + const Primitive::Type type, + bool isR6, + MipsAssembler* assembler) { + DCHECK(type == Primitive::kPrimInt || type == Primitive::kPrimLong); + + if (type == Primitive::kPrimLong) { + Register in_lo = locations->InAt(0).AsRegisterPairLow<Register>(); + Register in_hi = locations->InAt(0).AsRegisterPairHigh<Register>(); + Register out_lo = locations->Out().AsRegisterPairLow<Register>(); + Register out_hi = locations->Out().AsRegisterPairHigh<Register>(); + + if (isR6) { + __ ClzR6(TMP, in_hi); + } else { + __ ClzR2(TMP, in_hi); + } + __ LoadConst32(AT, 0x80000000); + __ Srlv(out_hi, AT, TMP); + __ And(out_hi, out_hi, in_hi); + if (isR6) { + __ ClzR6(TMP, in_lo); + } else { + __ ClzR2(TMP, in_lo); + } + __ Srlv(out_lo, AT, TMP); + __ And(out_lo, out_lo, in_lo); + if (isR6) { + __ Seleqz(out_lo, out_lo, out_hi); + } else { + __ Movn(out_lo, ZERO, out_hi); + } + } else { + Register in = locations->InAt(0).AsRegister<Register>(); + Register out = locations->Out().AsRegister<Register>(); + + if (isR6) { + __ ClzR6(TMP, in); + } else { + __ ClzR2(TMP, in); + } + __ LoadConst32(AT, 0x80000000); + __ Srlv(AT, AT, TMP); // Srlv shifts in the range of [0;31] bits (lower 5 bits of arg). + __ And(out, AT, in); // So this is required for 0 (=shift by 32). + } +} + +// int java.lang.Integer.highestOneBit(int) +void IntrinsicLocationsBuilderMIPS::VisitIntegerHighestOneBit(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitIntegerHighestOneBit(HInvoke* invoke) { + GenHighestOneBit(invoke->GetLocations(), Primitive::kPrimInt, IsR6(), GetAssembler()); +} + +// long java.lang.Long.highestOneBit(long) +void IntrinsicLocationsBuilderMIPS::VisitLongHighestOneBit(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke, Location::kOutputOverlap); +} + +void IntrinsicCodeGeneratorMIPS::VisitLongHighestOneBit(HInvoke* invoke) { + GenHighestOneBit(invoke->GetLocations(), Primitive::kPrimLong, IsR6(), GetAssembler()); +} + +static void GenLowestOneBit(LocationSummary* locations, + const Primitive::Type type, + bool isR6, + MipsAssembler* assembler) { + DCHECK(type == Primitive::kPrimInt || type == Primitive::kPrimLong); + + if (type == Primitive::kPrimLong) { + Register in_lo = locations->InAt(0).AsRegisterPairLow<Register>(); + Register in_hi = locations->InAt(0).AsRegisterPairHigh<Register>(); + Register out_lo = locations->Out().AsRegisterPairLow<Register>(); + Register out_hi = locations->Out().AsRegisterPairHigh<Register>(); + + __ Subu(TMP, ZERO, in_lo); + __ And(out_lo, TMP, in_lo); + __ Subu(TMP, ZERO, in_hi); + __ And(out_hi, TMP, in_hi); + if (isR6) { + __ Seleqz(out_hi, out_hi, out_lo); + } else { + __ Movn(out_hi, ZERO, out_lo); + } + } else { + Register in = locations->InAt(0).AsRegister<Register>(); + Register out = locations->Out().AsRegister<Register>(); + + __ Subu(TMP, ZERO, in); + __ And(out, TMP, in); + } +} + +// int java.lang.Integer.lowestOneBit(int) +void IntrinsicLocationsBuilderMIPS::VisitIntegerLowestOneBit(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitIntegerLowestOneBit(HInvoke* invoke) { + GenLowestOneBit(invoke->GetLocations(), Primitive::kPrimInt, IsR6(), GetAssembler()); +} + +// long java.lang.Long.lowestOneBit(long) +void IntrinsicLocationsBuilderMIPS::VisitLongLowestOneBit(HInvoke* invoke) { + CreateIntToIntLocations(arena_, invoke); +} + +void IntrinsicCodeGeneratorMIPS::VisitLongLowestOneBit(HInvoke* invoke) { + GenLowestOneBit(invoke->GetLocations(), Primitive::kPrimLong, IsR6(), GetAssembler()); +} + +// Unimplemented intrinsics. UNIMPLEMENTED_INTRINSIC(MIPS, MathCeil) UNIMPLEMENTED_INTRINSIC(MIPS, MathFloor) @@ -1559,16 +1832,10 @@ UNIMPLEMENTED_INTRINSIC(MIPS, MathSinh) UNIMPLEMENTED_INTRINSIC(MIPS, MathTan) UNIMPLEMENTED_INTRINSIC(MIPS, MathTanh) -UNIMPLEMENTED_INTRINSIC(MIPS, FloatIsInfinite) -UNIMPLEMENTED_INTRINSIC(MIPS, DoubleIsInfinite) - -UNIMPLEMENTED_INTRINSIC(MIPS, IntegerHighestOneBit) -UNIMPLEMENTED_INTRINSIC(MIPS, LongHighestOneBit) -UNIMPLEMENTED_INTRINSIC(MIPS, IntegerLowestOneBit) -UNIMPLEMENTED_INTRINSIC(MIPS, LongLowestOneBit) - UNREACHABLE_INTRINSICS(MIPS) +#undef UNIMPLEMENTED_INTRINSIC + #undef __ } // namespace mips diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 0e0b83e4b4..77ded29b49 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -127,6 +127,9 @@ void HGraph::RemoveDeadBlocks(const ArenaBitVector& visited) { // Remove the block from the list of blocks, so that further analyses // never see it. blocks_[i] = nullptr; + if (block->IsExitBlock()) { + SetExitBlock(nullptr); + } } } } @@ -1870,7 +1873,7 @@ void HGraph::DeleteDeadEmptyBlock(HBasicBlock* block) { DCHECK(block->GetPhis().IsEmpty()); if (block->IsExitBlock()) { - exit_block_ = nullptr; + SetExitBlock(nullptr); } RemoveElement(reverse_post_order_, block); diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 13d6d620f8..c1b4d2403d 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -483,7 +483,11 @@ NO_INLINE // Avoid increasing caller's frame size by large stack-allocated obje static void AllocateRegisters(HGraph* graph, CodeGenerator* codegen, PassObserver* pass_observer) { - PrepareForRegisterAllocation(graph).Run(); + { + PassScope scope(PrepareForRegisterAllocation::kPrepareForRegisterAllocationPassName, + pass_observer); + PrepareForRegisterAllocation(graph).Run(); + } SsaLivenessAnalysis liveness(graph, codegen); { PassScope scope(SsaLivenessAnalysis::kLivenessPassName, pass_observer); diff --git a/compiler/optimizing/prepare_for_register_allocation.h b/compiler/optimizing/prepare_for_register_allocation.h index c8b8b0dcfa..c90724c251 100644 --- a/compiler/optimizing/prepare_for_register_allocation.h +++ b/compiler/optimizing/prepare_for_register_allocation.h @@ -32,6 +32,9 @@ class PrepareForRegisterAllocation : public HGraphDelegateVisitor { void Run(); + static constexpr const char* kPrepareForRegisterAllocationPassName = + "prepare_for_register_allocation"; + private: void VisitNullCheck(HNullCheck* check) OVERRIDE; void VisitDivZeroCheck(HDivZeroCheck* check) OVERRIDE; diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index d9a2f300d9..f25d748490 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -698,6 +698,12 @@ class Dex2Oat FINAL { Usage("Can't have both --image and (--app-image-fd or --app-image-file)"); } + if (IsBootImage()) { + // We need the boot image to always be debuggable. + // TODO: Remove this once we better deal with full frame deoptimization. + compiler_options_->debuggable_ = true; + } + if (oat_filenames_.empty() && oat_fd_ == -1) { Usage("Output must be supplied with either --oat-file or --oat-fd"); } diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h index ebe89bbbd2..12d6d8f015 100644 --- a/runtime/art_method-inl.h +++ b/runtime/art_method-inl.h @@ -463,12 +463,6 @@ void ArtMethod::VisitRoots(RootVisitorType& visitor, size_t pointer_size) { interface_method->VisitRoots(visitor, pointer_size); } visitor.VisitRoot(declaring_class_.AddressWithoutBarrier()); - if (!IsNative()) { - ProfilingInfo* profiling_info = GetProfilingInfo(pointer_size); - if (profiling_info != nullptr) { - profiling_info->VisitRoots(visitor); - } - } } } diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 5c4419333b..191c0c7cf2 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -716,9 +716,11 @@ void JavaVMExt::UnloadNativeLibraries() { libraries_.get()->UnloadNativeLibraries(); } -bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject class_loader, - bool is_shared_namespace, jstring library_path, - jstring permitted_path, std::string* error_msg) { +bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, + const std::string& path, + jobject class_loader, + jstring library_path, + std::string* error_msg) { error_msg->clear(); // See if we've already loaded this library. If we have, and the class loader @@ -777,9 +779,12 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject Locks::mutator_lock_->AssertNotHeld(self); const char* path_str = path.empty() ? nullptr : path.c_str(); - void* handle = android::OpenNativeLibrary(env, runtime_->GetTargetSdkVersion(), path_str, - class_loader, is_shared_namespace, library_path, - permitted_path); + void* handle = android::OpenNativeLibrary(env, + runtime_->GetTargetSdkVersion(), + path_str, + class_loader, + library_path); + bool needs_native_bridge = false; if (handle == nullptr) { if (android::NativeBridgeIsSupported(path_str)) { diff --git a/runtime/java_vm_ext.h b/runtime/java_vm_ext.h index 8cae1e52d2..3d055cd7ce 100644 --- a/runtime/java_vm_ext.h +++ b/runtime/java_vm_ext.h @@ -85,8 +85,10 @@ class JavaVMExt : public JavaVM { * Returns 'true' on success. On failure, sets 'error_msg' to a * human-readable description of the error. */ - bool LoadNativeLibrary(JNIEnv* env, const std::string& path, jobject class_loader, - bool is_shared_namespace, jstring library_path, jstring permitted_path, + bool LoadNativeLibrary(JNIEnv* env, + const std::string& path, + jobject class_loader, + jstring library_path, std::string* error_msg); // Unload native libraries with cleared class loaders. diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 19584edf7f..cbcb4b964b 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -29,6 +29,7 @@ #include "dex_cache.h" #include "dex_file.h" #include "gc/heap-inl.h" +#include "jit/profiling_info.h" #include "iftable.h" #include "object_array-inl.h" #include "read_barrier-inl.h" @@ -939,6 +940,12 @@ void mirror::Class::VisitNativeRoots(Visitor& visitor, size_t pointer_size) { } for (ArtMethod& method : GetMethods(pointer_size)) { method.VisitRoots(visitor, pointer_size); + if (!method.IsNative()) { + ProfilingInfo* profiling_info = method.GetProfilingInfo(pointer_size); + if (profiling_info != nullptr) { + profiling_info->VisitRoots(visitor); + } + } } } diff --git a/runtime/native/java_lang_Runtime.cc b/runtime/native/java_lang_Runtime.cc index c177f19b56..df794e1249 100644 --- a/runtime/native/java_lang_Runtime.cc +++ b/runtime/native/java_lang_Runtime.cc @@ -67,9 +67,11 @@ static void SetLdLibraryPath(JNIEnv* env, jstring javaLdLibraryPath) { #endif } -static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, jobject javaLoader, - jboolean isSharedNamespace, jstring javaLibrarySearchPath, - jstring javaLibraryPermittedPath) { +static jstring Runtime_nativeLoad(JNIEnv* env, + jclass, + jstring javaFilename, + jobject javaLoader, + jstring javaLibrarySearchPath) { ScopedUtfChars filename(env, javaFilename); if (filename.c_str() == nullptr) { return nullptr; @@ -79,7 +81,9 @@ static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, job // Starting with N nativeLoad uses classloader local // linker namespace instead of global LD_LIBRARY_PATH - // (23 is Marshmallow) + // (23 is Marshmallow). This call is here to preserve + // backwards compatibility for the apps targeting sdk + // version <= 23 if (target_sdk_version == 0) { SetLdLibraryPath(env, javaLibrarySearchPath); } @@ -90,9 +94,7 @@ static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, job bool success = vm->LoadNativeLibrary(env, filename.c_str(), javaLoader, - isSharedNamespace == JNI_TRUE, javaLibrarySearchPath, - javaLibraryPermittedPath, &error_msg); if (success) { return nullptr; @@ -121,7 +123,7 @@ static JNINativeMethod gMethods[] = { NATIVE_METHOD(Runtime, gc, "()V"), NATIVE_METHOD(Runtime, maxMemory, "!()J"), NATIVE_METHOD(Runtime, nativeExit, "(I)V"), - NATIVE_METHOD(Runtime, nativeLoad, "(Ljava/lang/String;Ljava/lang/ClassLoader;ZLjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"), + NATIVE_METHOD(Runtime, nativeLoad, "(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/String;"), NATIVE_METHOD(Runtime, totalMemory, "!()J"), }; diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc index 725067a351..d377457eb2 100644 --- a/runtime/openjdkjvm/OpenjdkJvm.cc +++ b/runtime/openjdkjvm/OpenjdkJvm.cc @@ -329,9 +329,10 @@ static void SetLdLibraryPath(JNIEnv* env, jstring javaLdLibraryPath) { } -JNIEXPORT jstring JVM_NativeLoad(JNIEnv* env, jstring javaFilename, jobject javaLoader, - jboolean isSharedNamespace, jstring javaLibrarySearchPath, - jstring javaLibraryPermittedPath) { +JNIEXPORT jstring JVM_NativeLoad(JNIEnv* env, + jstring javaFilename, + jobject javaLoader, + jstring javaLibrarySearchPath) { ScopedUtfChars filename(env, javaFilename); if (filename.c_str() == NULL) { return NULL; @@ -354,9 +355,7 @@ JNIEXPORT jstring JVM_NativeLoad(JNIEnv* env, jstring javaFilename, jobject java bool success = vm->LoadNativeLibrary(env, filename.c_str(), javaLoader, - isSharedNamespace == JNI_TRUE, javaLibrarySearchPath, - javaLibraryPermittedPath, &error_msg); if (success) { return nullptr; diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 47ef2143ff..8c813b4f16 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1280,9 +1280,7 @@ void Runtime::InitNativeMethods() { // libcore can't because it's the library that implements System.loadLibrary! { std::string error_msg; - if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, - /* is_shared_namespace */ false, - nullptr, nullptr, &error_msg)) { + if (!java_vm_->LoadNativeLibrary(env, "libjavacore.so", nullptr, nullptr, &error_msg)) { LOG(FATAL) << "LoadNativeLibrary failed for \"libjavacore.so\": " << error_msg; } } @@ -1291,9 +1289,7 @@ void Runtime::InitNativeMethods() { ? "libopenjdkd.so" : "libopenjdk.so"; std::string error_msg; - if (!java_vm_->LoadNativeLibrary(env, kOpenJdkLibrary, nullptr, - /* is_shared_namespace */ false, - nullptr, nullptr, &error_msg)) { + if (!java_vm_->LoadNativeLibrary(env, kOpenJdkLibrary, nullptr, nullptr, &error_msg)) { LOG(FATAL) << "LoadNativeLibrary failed for \"" << kOpenJdkLibrary << "\": " << error_msg; } } diff --git a/runtime/trace.cc b/runtime/trace.cc index 99b2296b60..6b826414bd 100644 --- a/runtime/trace.cc +++ b/runtime/trace.cc @@ -389,9 +389,10 @@ void Trace::StopTracing(bool finish_tracing, bool flush_file) { bool stop_alloc_counting = false; Runtime* const runtime = Runtime::Current(); Trace* the_trace = nullptr; + Thread* const self = Thread::Current(); pthread_t sampling_pthread = 0U; { - MutexLock mu(Thread::Current(), *Locks::trace_lock_); + MutexLock mu(self, *Locks::trace_lock_); if (the_trace_ == nullptr) { LOG(ERROR) << "Trace stop requested, but no trace currently running"; } else { @@ -409,6 +410,9 @@ void Trace::StopTracing(bool finish_tracing, bool flush_file) { } { + gc::ScopedGCCriticalSection gcs(self, + gc::kGcCauseInstrumentation, + gc::kCollectorTypeInstrumentation); ScopedSuspendAll ssa(__FUNCTION__); if (the_trace != nullptr) { stop_alloc_counting = (the_trace->flags_ & Trace::kTraceCountAllocs) != 0; @@ -417,7 +421,7 @@ void Trace::StopTracing(bool finish_tracing, bool flush_file) { } if (the_trace->trace_mode_ == TraceMode::kSampling) { - MutexLock mu(Thread::Current(), *Locks::thread_list_lock_); + MutexLock mu(self, *Locks::thread_list_lock_); runtime->GetThreadList()->ForEach(ClearThreadStackTraceAndClockBase, nullptr); } else { runtime->GetInstrumentation()->DisableMethodTracing(kTracerInstrumentationKey); diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index 0c6060e4e8..f71ebfe8b7 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -16,6 +16,9 @@ #include "method_verifier-inl.h" +#define ATRACE_TAG ATRACE_TAG_DALVIK +#include <cutils/trace.h> + #include <iostream> #include "art_field-inl.h" @@ -283,6 +286,7 @@ MethodVerifier::FailureKind MethodVerifier::VerifyClass(Thread* self, // empty class, probably a marker interface return kNoFailure; } + ATRACE_BEGIN("VerifyClass"); ClassDataItemIterator it(*dex_file, class_data); while (it.HasNextStaticField() || it.HasNextInstanceField()) { it.Next(); @@ -317,6 +321,8 @@ MethodVerifier::FailureKind MethodVerifier::VerifyClass(Thread* self, data1.Merge(data2); + ATRACE_END(); + if (data1.kind == kNoFailure) { return kNoFailure; } else { diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index cfa8329a36..d288943528 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -385,7 +385,7 @@ void WellKnownClasses::LateInit(JNIEnv* env) { ScopedLocalRef<jclass> java_lang_Runtime(env, env->FindClass("java/lang/Runtime")); java_lang_Runtime_nativeLoad = CacheMethod(env, java_lang_Runtime.get(), true, "nativeLoad", - "(Ljava/lang/String;Ljava/lang/ClassLoader;ZLjava/lang/String;Ljava/lang/String;)" + "(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/lang/String;)" "Ljava/lang/String;"); } diff --git a/test/048-reflect-v8/build b/test/048-reflect-v8/build index 4ea1838465..3552b5c46c 100644 --- a/test/048-reflect-v8/build +++ b/test/048-reflect-v8/build @@ -20,9 +20,5 @@ set -e # Hard-wired use of experimental jack. # TODO: fix this temporary work-around for lambdas, see b/19467889 export USE_JACK=true -export JACK_SERVER=false -export JACK_REPOSITORY="${ANDROID_BUILD_TOP}/prebuilts/sdk/tools/jacks" -# e.g. /foo/bar/jack-3.10.ALPHA.jar -> 3.10.ALPHA -export JACK_VERSION="$(find "$JACK_REPOSITORY" -name '*ALPHA*' | sed 's/.*jack-//g' | sed 's/[.]jar//g')" ./default-build "$@" --experimental default-methods diff --git a/test/082-inline-execute/src/Main.java b/test/082-inline-execute/src/Main.java index 93a9005fe0..9aaed9d589 100644 --- a/test/082-inline-execute/src/Main.java +++ b/test/082-inline-execute/src/Main.java @@ -40,6 +40,10 @@ public class Main { test_Math_rint(); test_Math_round_D(); test_Math_round_F(); + test_Math_isNaN_D(); + test_Math_isNaN_F(); + test_Math_isInfinite_D(); + test_Math_isInfinite_F(); test_Short_reverseBytes(); test_Integer_reverseBytes(); test_Long_reverseBytes(); @@ -836,6 +840,106 @@ public class Main { Assert.assertEquals(Math.round(Float.NEGATIVE_INFINITY), Integer.MIN_VALUE); } + public static void test_Math_isNaN_D() { + // Quiet NaN. + Assert.assertTrue(Double.isNaN(Double.longBitsToDouble(0x7FF4000000000000l))); + Assert.assertTrue(Double.isNaN(Double.longBitsToDouble(0xFFF4000000000000l))); + // Signaling NaN. + Assert.assertTrue(Double.isNaN(Double.longBitsToDouble(0x7FF8000000000000l))); + Assert.assertTrue(Double.isNaN(Double.longBitsToDouble(0xFFF8000000000000l))); + // Distinct from +/- infinity. + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x7FF0000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0xFFF0000000000000l))); + // Distinct from normal numbers. + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x7FE0000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0xFFE0000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x0010000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x8010000000000000l))); + // Distinct from +/- zero. + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x0000000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x8000000000000000l))); + // Distinct from subnormal numbers. + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x0008000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x8008000000000000l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x0000000000000001l))); + Assert.assertFalse(Double.isNaN(Double.longBitsToDouble(0x8000000000000001l))); + } + + public static void test_Math_isNaN_F() { + // Quiet NaN. + Assert.assertTrue(Float.isNaN(Float.intBitsToFloat(0x7FA00000))); + Assert.assertTrue(Float.isNaN(Float.intBitsToFloat(0xFFA00000))); + // Signaling NaN. + Assert.assertTrue(Float.isNaN(Float.intBitsToFloat(0x7FC00000))); + Assert.assertTrue(Float.isNaN(Float.intBitsToFloat(0xFFC00000))); + // Distinct from +/- infinity. + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x7F800000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0xFF800000))); + // Distinct from normal numbers. + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x7F000000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0xFF000000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x00800000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x80800000))); + // Distinct from +/- zero. + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x00000000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x80000000))); + // Distinct from subnormal numbers. + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x00400000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x80400000))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x00000001))); + Assert.assertFalse(Float.isNaN(Float.intBitsToFloat(0x80000001))); + } + + public static void test_Math_isInfinite_D() { + // Distinct from Quiet NaN. + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x7FF4000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0xFFF4000000000000l))); + // Distinct from Signaling NaN. + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x7FF8000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0xFFF8000000000000l))); + // +/- infinity. + Assert.assertTrue(Double.isInfinite(Double.longBitsToDouble(0x7FF0000000000000l))); + Assert.assertTrue(Double.isInfinite(Double.longBitsToDouble(0xFFF0000000000000l))); + // Distinct from normal numbers. + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x7FE0000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0xFFE0000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x0010000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x8010000000000000l))); + // Distinct from +/- zero. + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x0000000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x8000000000000000l))); + // Distinct from subnormal numbers. + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x0008000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x8008000000000000l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x0000000000000001l))); + Assert.assertFalse(Double.isInfinite(Double.longBitsToDouble(0x8000000000000001l))); + } + + public static void test_Math_isInfinite_F() { + // Distinct from Quiet NaN. + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x7FA00000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0xFFA00000))); + // Distinct from Signaling NaN. + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x7FC00000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0xFFC00000))); + // +/- infinity. + Assert.assertTrue(Float.isInfinite(Float.intBitsToFloat(0x7F800000))); + Assert.assertTrue(Float.isInfinite(Float.intBitsToFloat(0xFF800000))); + // Distinct from normal numbers. + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x7F000000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0xFF000000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x00800000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x80800000))); + // Distinct from +/- zero. + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x00000000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x80000000))); + // Distinct from subnormal numbers. + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x00400000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x80400000))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x00000001))); + Assert.assertFalse(Float.isInfinite(Float.intBitsToFloat(0x80000001))); + } + public static void test_StrictMath_abs_I() { StrictMath.abs(-1); Assert.assertEquals(StrictMath.abs(0), 0); diff --git a/test/563-checker-invoke-super/build b/test/563-checker-invoke-super/build index e06193ba78..32f84ef5ab 100755 --- a/test/563-checker-invoke-super/build +++ b/test/563-checker-invoke-super/build @@ -20,9 +20,5 @@ set -e # Hard-wired use of experimental jack. # TODO: fix this temporary work-around for lambdas, see b/19467889 export USE_JACK=true -export JACK_SERVER=false -export JACK_REPOSITORY="${ANDROID_BUILD_TOP}/prebuilts/sdk/tools/jacks" -# e.g. /foo/bar/jack-3.10.ALPHA.jar -> 3.10.ALPHA -export JACK_VERSION="$(find "$JACK_REPOSITORY" -name '*ALPHA*' | sed 's/.*jack-//g' | sed 's/[.]jar//g')" ./default-build "$@" --experimental default-methods diff --git a/test/579-inline-infinite/expected.txt b/test/579-inline-infinite/expected.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/579-inline-infinite/expected.txt diff --git a/test/579-inline-infinite/info.txt b/test/579-inline-infinite/info.txt new file mode 100644 index 0000000000..6fb917c222 --- /dev/null +++ b/test/579-inline-infinite/info.txt @@ -0,0 +1,2 @@ +Regression test for optimizing. +Inlining of method with infinite loop cause a crash. diff --git a/test/579-inline-infinite/src/Main.java b/test/579-inline-infinite/src/Main.java new file mode 100644 index 0000000000..f214ed4ffd --- /dev/null +++ b/test/579-inline-infinite/src/Main.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class Infinite implements Runnable { + public int field; + + private final void $noinline$infinite() { + while(true) { + field++; + } + } + + public void run() { + $noinline$infinite(); + } +} + +public class Main { + public static void main(String[] args) { + Thread thr = new Thread(new Infinite()); + thr.setDaemon(true); + thr.start(); + // This is a compiler test, so just finish. + } +} diff --git a/test/960-default-smali/build b/test/960-default-smali/build index b72afcdf18..e8f4ed084a 100755 --- a/test/960-default-smali/build +++ b/test/960-default-smali/build @@ -17,27 +17,14 @@ # make us exit on a failure set -e -# Generate the smali Main.smali file or fail -${ANDROID_BUILD_TOP}/art/test/utils/python/generate_smali_main.py ./smali - -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 >& /dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi +# Generate the Main.java file or fail +${ANDROID_BUILD_TOP}/art/test/utils/python/generate_java_main.py ./src -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods diff --git a/test/960-default-smali/smali/A.smali b/test/960-default-smali/smali/A.smali deleted file mode 100644 index e755612fbe..0000000000 --- a/test/960-default-smali/smali/A.smali +++ /dev/null @@ -1,38 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LA; -.super Ljava/lang/Object; -.implements LGreeter; - -# class A implements Greeter { -# public String SayHi() { -# return "Hi "; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .registers 1 - - const-string v0, "Hi " - return-object v0 -.end method diff --git a/test/960-default-smali/smali/Attendant.smali b/test/960-default-smali/smali/Attendant.smali deleted file mode 100644 index ab63aeefcb..0000000000 --- a/test/960-default-smali/smali/Attendant.smali +++ /dev/null @@ -1,53 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public abstract interface LAttendant; -.super Ljava/lang/Object; - -# public interface Attendant { -# public default String SayHi() { -# return "welcome to " + GetPlace(); -# } -# public default String SayHiTwice() { -# return SayHi() + SayHi(); -# } -# -# public String GetPlace(); -# } - -.method public SayHi()Ljava/lang/String; - .locals 2 - const-string v0, "welcome to " - invoke-interface {p0}, LAttendant;->GetPlace()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method - -.method public SayHiTwice()Ljava/lang/String; - .locals 2 - invoke-interface {p0}, LAttendant;->SayHi()Ljava/lang/String; - move-result-object v0 - invoke-interface {p0}, LAttendant;->SayHi()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method - -.method public abstract GetPlace()Ljava/lang/String; -.end method diff --git a/test/960-default-smali/smali/B.smali b/test/960-default-smali/smali/B.smali deleted file mode 100644 index d847dd12ff..0000000000 --- a/test/960-default-smali/smali/B.smali +++ /dev/null @@ -1,38 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LB; -.super Ljava/lang/Object; -.implements LGreeter2; - -# class B implements Greeter2 { -# public String SayHi() { -# return "Hello "; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .registers 1 - - const-string v0, "Hello " - return-object v0 -.end method diff --git a/test/960-default-smali/smali/C.smali b/test/960-default-smali/smali/C.smali deleted file mode 100644 index 08a8508be1..0000000000 --- a/test/960-default-smali/smali/C.smali +++ /dev/null @@ -1,37 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LC; -.super LA; - -# class C extends A { -# public String SayHiTwice() { -# return "You don't control me"; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LA;-><init>()V - return-void -.end method - -.method public SayHiTwice()Ljava/lang/String; - .registers 1 - - const-string v0, "You don't control me" - return-object v0 -.end method diff --git a/test/960-default-smali/smali/D.smali b/test/960-default-smali/smali/D.smali deleted file mode 100644 index 32f3b7ec8b..0000000000 --- a/test/960-default-smali/smali/D.smali +++ /dev/null @@ -1,38 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LD; -.super Ljava/lang/Object; -.implements LGreeter3; - -# class D implements Greeter3 { -# public String GetName() { -# return "Alex "; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public GetName()Ljava/lang/String; - .registers 1 - - const-string v0, "Alex " - return-object v0 -.end method diff --git a/test/960-default-smali/smali/E.smali b/test/960-default-smali/smali/E.smali deleted file mode 100644 index bae6250414..0000000000 --- a/test/960-default-smali/smali/E.smali +++ /dev/null @@ -1,38 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LE; -.super LA; -.implements LGreeter2; - -# class E extends A implements Greeter2 { -# public String SayHi() { -# return "Hi2 "; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LA;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .registers 1 - - const-string v0, "Hi2 " - return-object v0 -.end method diff --git a/test/960-default-smali/smali/Extension.smali b/test/960-default-smali/smali/Extension.smali deleted file mode 100644 index 60ffa26ec6..0000000000 --- a/test/960-default-smali/smali/Extension.smali +++ /dev/null @@ -1,30 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public abstract interface LExtension; -.super Ljava/lang/Object; - -# public interface Extension { -# public default String SayHi() { -# return "welcome "; -# } -# } - -.method public SayHi()Ljava/lang/String; - .locals 1 - const-string v0, "welcome " - return-object v0 -.end method diff --git a/test/960-default-smali/smali/F.smali b/test/960-default-smali/smali/F.smali deleted file mode 100644 index 3eaa089e1f..0000000000 --- a/test/960-default-smali/smali/F.smali +++ /dev/null @@ -1,47 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LF; -.super LA; -.implements LAttendant; - -# class F extends A implements Attendant { -# public String GetPlace() { -# return "android"; -# } -# public String SayHiTwice() { -# return "We can override both interfaces"; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHiTwice()Ljava/lang/String; - .registers 1 - - const-string v0, "We can override both interfaces" - return-object v0 -.end method - -.method public GetPlace()Ljava/lang/String; - .registers 1 - const-string v0, "android" - return-object v0 -.end method diff --git a/test/960-default-smali/smali/G.smali b/test/960-default-smali/smali/G.smali deleted file mode 100644 index 446f2a4c64..0000000000 --- a/test/960-default-smali/smali/G.smali +++ /dev/null @@ -1,37 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LG; -.super Ljava/lang/Object; -.implements LAttendant; - -# class G implements Attendant { -# public String GetPlace() { -# return "android"; -# } -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public GetPlace()Ljava/lang/String; - .registers 1 - const-string v0, "android" - return-object v0 -.end method diff --git a/test/960-default-smali/smali/Greeter.smali b/test/960-default-smali/smali/Greeter.smali deleted file mode 100644 index 28530ffc6f..0000000000 --- a/test/960-default-smali/smali/Greeter.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public abstract interface LGreeter; -.super Ljava/lang/Object; - -# public interface Greeter { -# public String SayHi(); -# -# public default String SayHiTwice() { -# return SayHi() + SayHi(); -# } -# } - -.method public abstract SayHi()Ljava/lang/String; -.end method - -.method public SayHiTwice()Ljava/lang/String; - .locals 2 - invoke-interface {p0}, LGreeter;->SayHi()Ljava/lang/String; - move-result-object v0 - invoke-interface {p0}, LGreeter;->SayHi()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/960-default-smali/smali/Greeter2.smali b/test/960-default-smali/smali/Greeter2.smali deleted file mode 100644 index ace1798bab..0000000000 --- a/test/960-default-smali/smali/Greeter2.smali +++ /dev/null @@ -1,39 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public abstract interface LGreeter2; -.super Ljava/lang/Object; -.implements LGreeter; - -# public interface Greeter2 extends Greeter { -# public default String SayHiTwice() { -# return "I say " + SayHi() + SayHi(); -# } -# } - -.method public SayHiTwice()Ljava/lang/String; - .locals 3 - const-string v0, "I say " - invoke-interface {p0}, LGreeter;->SayHi()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - invoke-interface {p0}, LGreeter;->SayHi()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/960-default-smali/smali/Greeter3.smali b/test/960-default-smali/smali/Greeter3.smali deleted file mode 100644 index 31fc2e79ff..0000000000 --- a/test/960-default-smali/smali/Greeter3.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public abstract interface LGreeter3; -.super Ljava/lang/Object; -.implements LGreeter; - -# public interface Greeter3 extends Greeter { -# public String GetName(); -# -# public default String SayHi() { -# return "Hello " + GetName(); -# } -# } - -.method public abstract GetName()Ljava/lang/String; -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - const-string v0, "Hello " - invoke-interface {p0}, LGreeter3;->GetName()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/960-default-smali/smali/H.smali b/test/960-default-smali/smali/H.smali deleted file mode 100644 index 82065ea49d..0000000000 --- a/test/960-default-smali/smali/H.smali +++ /dev/null @@ -1,28 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LH; -.super Ljava/lang/Object; -.implements LExtension; - -# class H implements Extension { -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method diff --git a/test/960-default-smali/smali/I.smali b/test/960-default-smali/smali/I.smali deleted file mode 100644 index 72fb58afe4..0000000000 --- a/test/960-default-smali/smali/I.smali +++ /dev/null @@ -1,28 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LI; -.super LA; -.implements LGreeter2; - -# class I extends A implements Greeter2 { -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method diff --git a/test/960-default-smali/smali/J.smali b/test/960-default-smali/smali/J.smali deleted file mode 100644 index 93f3d6231c..0000000000 --- a/test/960-default-smali/smali/J.smali +++ /dev/null @@ -1,29 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LJ; -.super LA; - -# class J extends A { -# } - - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LA;-><init>()V - return-void -.end method - diff --git a/test/960-default-smali/src/A.java b/test/960-default-smali/src/A.java new file mode 100644 index 0000000000..7664a263f1 --- /dev/null +++ b/test/960-default-smali/src/A.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class A implements Greeter { + public String SayHi() { + return "Hi "; + } +} diff --git a/test/960-default-smali/src/Attendant.java b/test/960-default-smali/src/Attendant.java new file mode 100644 index 0000000000..9f9a58a402 --- /dev/null +++ b/test/960-default-smali/src/Attendant.java @@ -0,0 +1,24 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Attendant { + public default String SayHi() { + return "welcome to " + GetPlace(); + } + public default String SayHiTwice() { + return SayHi() + SayHi(); + } + public String GetPlace(); +} diff --git a/test/960-default-smali/src/B.java b/test/960-default-smali/src/B.java new file mode 100644 index 0000000000..18aaadea4c --- /dev/null +++ b/test/960-default-smali/src/B.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class B implements Greeter2 { + public String SayHi() { + return "Hello "; + } +} diff --git a/test/960-default-smali/src/C.java b/test/960-default-smali/src/C.java new file mode 100644 index 0000000000..f0bc185f95 --- /dev/null +++ b/test/960-default-smali/src/C.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class C extends A { + public String SayHiTwice() { + return "You don't control me"; + } +} diff --git a/test/960-default-smali/src/D.java b/test/960-default-smali/src/D.java new file mode 100644 index 0000000000..b1697cd865 --- /dev/null +++ b/test/960-default-smali/src/D.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class D implements Greeter3 { + public String GetName() { + return "Alex "; + } +} diff --git a/test/960-default-smali/src/E.java b/test/960-default-smali/src/E.java new file mode 100644 index 0000000000..477cb6727c --- /dev/null +++ b/test/960-default-smali/src/E.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class E extends A implements Greeter2 { + public String SayHi() { + return "Hi2 "; + } +} diff --git a/test/960-default-smali/src/Extension.java b/test/960-default-smali/src/Extension.java new file mode 100644 index 0000000000..89617ddab6 --- /dev/null +++ b/test/960-default-smali/src/Extension.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Extension { + public default String SayHi() { + return "welcome "; + } +} diff --git a/test/960-default-smali/src/F.java b/test/960-default-smali/src/F.java new file mode 100644 index 0000000000..0282de7793 --- /dev/null +++ b/test/960-default-smali/src/F.java @@ -0,0 +1,23 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class F extends A implements Attendant { + public String GetPlace() { + return "android"; + } + public String SayHiTwice() { + return "We can override both interfaces"; + } +} diff --git a/test/960-default-smali/src/G.java b/test/960-default-smali/src/G.java new file mode 100644 index 0000000000..86a140aa43 --- /dev/null +++ b/test/960-default-smali/src/G.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class G implements Attendant { + public String GetPlace() { + return "android"; + } +} diff --git a/test/960-default-smali/src/Greeter.java b/test/960-default-smali/src/Greeter.java new file mode 100644 index 0000000000..cee2283acd --- /dev/null +++ b/test/960-default-smali/src/Greeter.java @@ -0,0 +1,21 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Greeter { + public String SayHi(); + public default String SayHiTwice() { + return SayHi() + SayHi(); + } +} diff --git a/test/960-default-smali/src/Greeter2.java b/test/960-default-smali/src/Greeter2.java new file mode 100644 index 0000000000..07f6c53841 --- /dev/null +++ b/test/960-default-smali/src/Greeter2.java @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Greeter2 extends Greeter { + public default String SayHiTwice() { + return "I say " + SayHi() + SayHi(); + } +} diff --git a/test/960-default-smali/src/Greeter3.java b/test/960-default-smali/src/Greeter3.java new file mode 100644 index 0000000000..bbb7171a36 --- /dev/null +++ b/test/960-default-smali/src/Greeter3.java @@ -0,0 +1,21 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Greeter3 extends Greeter { + public String GetName(); + public default String SayHi() { + return "Hello " + GetName(); + } +} diff --git a/test/960-default-smali/src/H.java b/test/960-default-smali/src/H.java new file mode 100644 index 0000000000..d87a6db8f4 --- /dev/null +++ b/test/960-default-smali/src/H.java @@ -0,0 +1,16 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class H implements Extension { } diff --git a/test/960-default-smali/src/I.java b/test/960-default-smali/src/I.java new file mode 100644 index 0000000000..8d6779cd27 --- /dev/null +++ b/test/960-default-smali/src/I.java @@ -0,0 +1,16 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class I extends A implements Greeter2 { } diff --git a/test/960-default-smali/src/J.java b/test/960-default-smali/src/J.java new file mode 100644 index 0000000000..a365e406c6 --- /dev/null +++ b/test/960-default-smali/src/J.java @@ -0,0 +1,16 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class J extends A { } diff --git a/test/960-default-smali/smali/classes.xml b/test/960-default-smali/src/classes.xml index 0aa41f7fb6..0aa41f7fb6 100644 --- a/test/960-default-smali/smali/classes.xml +++ b/test/960-default-smali/src/classes.xml diff --git a/test/961-default-iface-resolution-generated/build b/test/961-default-iface-resolution-generated/build index 005f76c2dc..ccebbe4ac9 100755 --- a/test/961-default-iface-resolution-generated/build +++ b/test/961-default-iface-resolution-generated/build @@ -26,32 +26,19 @@ restore_ulimit() { } trap 'restore_ulimit' ERR -mkdir -p ./smali - -# Generate the smali files and expected.txt or fail -./util-src/generate_smali.py ./smali ./expected.txt - -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ $USE_JACK == "true" ]]; then - if "$JACK" -D jack.java.source.version=1.8 >& /dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi +mkdir -p ./src + +# Generate the smali files and expected.txt or fail +./util-src/generate_java.py ./src ./expected.txt -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods # Reset the ulimit back to its initial value restore_ulimit diff --git a/test/961-default-iface-resolution-generated/util-src/generate_smali.py b/test/961-default-iface-resolution-generated/util-src/generate_java.py index 921a096dd3..a205cd6ce0 100755 --- a/test/961-default-iface-resolution-generated/util-src/generate_smali.py +++ b/test/961-default-iface-resolution-generated/util-src/generate_java.py @@ -15,7 +15,7 @@ # limitations under the License. """ -Generate Smali test files for test 961. +Generate Java test files for test 961. """ import os @@ -43,48 +43,27 @@ import string # every possible interface tree up to 5 layers deep. MAX_IFACE_DEPTH = 5 -class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): +class MainClass(mixins.DumpMixin, mixins.Named, mixins.JavaFileMixin): """ - A Main.smali file containing the Main class and the main function. It will run + A Main.java file containing the Main class and the main function. It will run all the test functions we have. """ MAIN_CLASS_TEMPLATE = """{copyright} - -.class public LMain; -.super Ljava/lang/Object; - -# class Main {{ - -.method public constructor <init>()V - .registers 1 - invoke-direct {{p0}}, Ljava/lang/Object;-><init>()V - return-void -.end method - +class Main {{ {test_groups} - {main_func} - -# }} +}} """ MAIN_FUNCTION_TEMPLATE = """ -# public static void main(String[] args) {{ -.method public static main([Ljava/lang/String;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - + public static void main(String[] args) {{ {test_group_invoke} - - return-void -.end method -# }} + }} """ TEST_GROUP_INVOKE_TEMPLATE = """ -# {test_name}(); - invoke-static {{}}, {test_name}()V + {test_name}(); """ def __init__(self): @@ -114,7 +93,7 @@ class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): def __str__(self): """ - Print the MainClass smali code. + Print the MainClass java code. """ all_tests = sorted(self.tests) test_invoke = "" @@ -125,7 +104,7 @@ class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): test_invoke += self.TEST_GROUP_INVOKE_TEMPLATE.format(test_name=t.get_name()) main_func = self.MAIN_FUNCTION_TEMPLATE.format(test_group_invoke=test_invoke) - return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright("smali"), + return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright("java"), test_groups = test_groups, main_func = main_func) @@ -136,49 +115,18 @@ class Func(mixins.Named, mixins.NameComparableMixin): """ TEST_FUNCTION_TEMPLATE = """ -# public static void {fname}() {{ -# try {{ -# {farg} v = new {farg}(); -# System.out.printf("%s calls default method on %s\\n", -# v.CalledClassName(), -# v.CalledInterfaceName()); -# return; -# }} catch (Error e) {{ -# e.printStackTrace(System.out); -# return; -# }} -# }} -.method public static {fname}()V - .locals 7 - :call_{fname}_try_start - new-instance v6, L{farg}; - invoke-direct {{v6}}, L{farg};-><init>()V - - const/4 v0, 2 - new-array v1,v0, [Ljava/lang/Object; - const/4 v0, 0 - invoke-virtual {{v6}}, L{farg};->CalledClassName()Ljava/lang/String; - move-result-object v4 - aput-object v4,v1,v0 - - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v3, "%s calls default method on %s\\n" - - invoke-virtual {{v6}}, L{farg};->CalledInterfaceName()Ljava/lang/String; - move-result-object v4 - const/4 v0, 1 - aput-object v4, v1, v0 - - invoke-virtual {{v2,v3,v1}}, Ljava/io/PrintStream;->printf(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream; - return-void - :call_{fname}_try_end - .catch Ljava/lang/Error; {{:call_{fname}_try_start .. :call_{fname}_try_end}} :error_{fname}_start - :error_{fname}_start - move-exception v3 - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - invoke-virtual {{v3,v2}}, Ljava/lang/Error;->printStackTrace(Ljava/io/PrintStream;)V - return-void -.end method + public static void {fname}() {{ + try {{ + {farg} v = new {farg}(); + System.out.printf("%s calls default method on %s\\n", + v.CalledClassName(), + v.CalledInterfaceName()); + return; + }} catch (Error e) {{ + e.printStackTrace(System.out); + return; + }} + }} """ def __init__(self, farg): @@ -202,38 +150,21 @@ class Func(mixins.Named, mixins.NameComparableMixin): def __str__(self): """ - Print the smali code of this function. + Print the java code of this function. """ return self.TEST_FUNCTION_TEMPLATE.format(fname=self.get_name(), farg=self.farg.get_name()) -class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.SmaliFileMixin): +class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.JavaFileMixin): """ A class that will be instantiated to test default method resolution order. """ TEST_CLASS_TEMPLATE = """{copyright} - -.class public L{class_name}; -.super Ljava/lang/Object; -.implements L{iface_name}; - -# public class {class_name} implements {iface_name} {{ -# public String CalledClassName() {{ -# return "{tree}"; -# }} -# }} - -.method public constructor <init>()V - .registers 1 - invoke-direct {{p0}}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public CalledClassName()Ljava/lang/String; - .locals 1 - const-string v0, "{tree}" - return-object v0 -.end method +public class {class_name} implements {iface_name} {{ + public String CalledClassName() {{ + return "{tree}"; + }} +}} """ def __init__(self, iface): @@ -276,46 +207,30 @@ class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixi def __str__(self): """ - Print the smali code of this class. + Print the java code of this class. """ - return self.TEST_CLASS_TEMPLATE.format(copyright = get_copyright('smali'), + return self.TEST_CLASS_TEMPLATE.format(copyright = get_copyright('java'), iface_name = self.iface.get_name(), tree = self.get_tree(), class_name = self.class_name) -class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.SmaliFileMixin): +class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.JavaFileMixin): """ An interface that will be used to test default method resolution order. """ TEST_INTERFACE_TEMPLATE = """{copyright} -.class public abstract interface L{class_name}; -.super Ljava/lang/Object; -{implements_spec} - -# public interface {class_name} {extends} {ifaces} {{ -# public String CalledClassName(); -.method public abstract CalledClassName()Ljava/lang/String; -.end method +public interface {class_name} {extends} {ifaces} {{ + public String CalledClassName(); {funcs} - -# }} +}} """ DEFAULT_FUNC_TEMPLATE = """ -# public default String CalledInterfaceName() {{ -# return "{tree}"; -# }} -.method public CalledInterfaceName()Ljava/lang/String; - .locals 1 - const-string v0, "{tree}" - return-object v0 -.end method -""" - - IMPLEMENTS_TEMPLATE = """ -.implements L{iface_name}; + public default String CalledInterfaceName() {{ + return "{tree}"; + }} """ def __init__(self, ifaces, default): @@ -357,12 +272,10 @@ class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, def __str__(self): """ - Print the smali code of this interface. + Print the java code of this interface. """ - s_ifaces = " " j_ifaces = " " for i in self.ifaces: - s_ifaces += self.IMPLEMENTS_TEMPLATE.format(iface_name = i.get_name()) j_ifaces += " {},".format(i.get_name()) j_ifaces = j_ifaces[0:-1] if self.default: @@ -371,8 +284,7 @@ class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, class_name = self.class_name) else: funcs = "" - return self.TEST_INTERFACE_TEMPLATE.format(copyright = get_copyright('smali'), - implements_spec = s_ifaces, + return self.TEST_INTERFACE_TEMPLATE.format(copyright = get_copyright('java'), extends = "extends" if len(self.ifaces) else "", ifaces = j_ifaces, funcs = funcs, @@ -451,16 +363,16 @@ def create_all_test_files(): return mc, classes def main(argv): - smali_dir = Path(argv[1]) - if not smali_dir.exists() or not smali_dir.is_dir(): - print("{} is not a valid smali dir".format(smali_dir), file=sys.stderr) + java_dir = Path(argv[1]) + if not java_dir.exists() or not java_dir.is_dir(): + print("{} is not a valid java dir".format(java_dir), file=sys.stderr) sys.exit(1) expected_txt = Path(argv[2]) mainclass, all_files = create_all_test_files() with expected_txt.open('w') as out: print(mainclass.get_expected(), file=out) for f in all_files: - f.dump(smali_dir) + f.dump(java_dir) if __name__ == '__main__': main(sys.argv) diff --git a/test/962-iface-static/build b/test/962-iface-static/build index e17272f769..0dd8573f54 100755 --- a/test/962-iface-static/build +++ b/test/962-iface-static/build @@ -17,24 +17,11 @@ # make us exit on a failure set -e -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi - -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods diff --git a/test/962-iface-static/smali/Displayer.smali b/test/962-iface-static/smali/Displayer.smali deleted file mode 100644 index ed4c013d3b..0000000000 --- a/test/962-iface-static/smali/Displayer.smali +++ /dev/null @@ -1,45 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class Displayer { -# static { -# System.out.println("init"); -# } -# -# public Displayer() { -# System.out.println("constructor"); -# } -# } - -.class public LDisplayer; -.super Ljava/lang/Object; - -.method static constructor <clinit>()V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "init" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - return-void -.end method - -.method public constructor <init>()V - .locals 2 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "constructor" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - return-void -.end method diff --git a/test/962-iface-static/smali/Main.smali b/test/962-iface-static/smali/Main.smali deleted file mode 100644 index 72fa5e0e6e..0000000000 --- a/test/962-iface-static/smali/Main.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Main { -# public static void main(String[] args) { -# System.out.println(iface.SayHi()); -# } -# } -.class public LMain; -.super Ljava/lang/Object; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public static main([Ljava/lang/String;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - - invoke-static {}, Liface;->SayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method diff --git a/test/962-iface-static/smali/iface.smali b/test/962-iface-static/smali/iface.smali deleted file mode 100644 index 5b9c03ec46..0000000000 --- a/test/962-iface-static/smali/iface.smali +++ /dev/null @@ -1,43 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface iface { -# public static final Displayer f = new Displayer(); -# -# public static String SayHi() { -# return "Hello"; -# } -# } - -.class public abstract interface Liface; -.super Ljava/lang/Object; - -.field public final static f:LDisplayer; - -.method static constructor <clinit>()V - .locals 3 - new-instance v1, LDisplayer; - invoke-direct {v1}, LDisplayer;-><init>()V - sput-object v1, Liface;->f:LDisplayer; - return-void -.end method - -.method public static SayHi()Ljava/lang/String; - .locals 1 - const-string v0, "Hello" - return-object v0 -.end method - diff --git a/test/962-iface-static/src/Displayer.java b/test/962-iface-static/src/Displayer.java new file mode 100644 index 0000000000..5b28b3f86d --- /dev/null +++ b/test/962-iface-static/src/Displayer.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class Displayer { + static { + System.out.println("init"); + } + public Displayer() { + System.out.println("constructor"); + } +} diff --git a/test/962-iface-static/src/Iface.java b/test/962-iface-static/src/Iface.java new file mode 100644 index 0000000000..82c7808a31 --- /dev/null +++ b/test/962-iface-static/src/Iface.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public static final Displayer f = new Displayer(); + public static String SayHi() { + return "Hello"; + } +} diff --git a/test/962-iface-static/src/Main.java b/test/962-iface-static/src/Main.java new file mode 100644 index 0000000000..7cb8eb7f7b --- /dev/null +++ b/test/962-iface-static/src/Main.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Main { + public static void main(String[] args) { + System.out.println(Iface.SayHi()); + } +} diff --git a/test/963-default-range-smali/build b/test/963-default-range-smali/build index e17272f769..0dd8573f54 100755 --- a/test/963-default-range-smali/build +++ b/test/963-default-range-smali/build @@ -17,24 +17,11 @@ # make us exit on a failure set -e -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi - -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods diff --git a/test/963-default-range-smali/smali/A.smali b/test/963-default-range-smali/smali/A.smali deleted file mode 100644 index b3d91dd76b..0000000000 --- a/test/963-default-range-smali/smali/A.smali +++ /dev/null @@ -1,29 +0,0 @@ -# /* -# * Copyright 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ - -.class public LA; -.super Ljava/lang/Object; -.implements Liface; - -# class A implements iface { -# } - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - diff --git a/test/963-default-range-smali/smali/Main.smali b/test/963-default-range-smali/smali/Main.smali deleted file mode 100644 index 400fba72d9..0000000000 --- a/test/963-default-range-smali/smali/Main.smali +++ /dev/null @@ -1,77 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Main { -# public static void main(String[] args) { -# A a = new A(); -# System.out.println(a.SayHi("a string 0", -# "a string 1", -# "a string 2", -# "a string 3", -# "a string 4", -# "a string 5", -# "a string 6", -# "a string 7", -# "a string 8", -# "a string 9")); -# iface b = (iface)a; -# System.out.println(b.SayHi("a string 0", -# "a string 1", -# "a string 2", -# "a string 3", -# "a string 4", -# "a string 5", -# "a string 6", -# "a string 7", -# "a string 8", -# "a string 9")); -# } -# } -.class public LMain; -.super Ljava/lang/Object; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public static main([Ljava/lang/String;)V - .locals 15 - sget-object v12, Ljava/lang/System;->out:Ljava/io/PrintStream; - - new-instance v1, LA; - invoke-direct {v1}, LA;-><init>()V - const-string v2, "a string 0" - const-string v3, "a string 1" - const-string v4, "a string 2" - const-string v5, "a string 3" - const-string v6, "a string 4" - const-string v7, "a string 5" - const-string v8, "a string 6" - const-string v9, "a string 7" - const-string v10, "a string 8" - const-string v11, "a string 9" - invoke-virtual/range {v1 .. v11}, LA;->SayHi(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - invoke-virtual {v12,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface/range {v1 .. v11}, Liface;->SayHi(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - invoke-virtual {v12,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method diff --git a/test/963-default-range-smali/smali/iface.smali b/test/963-default-range-smali/smali/iface.smali deleted file mode 100644 index c2c3ce69a7..0000000000 --- a/test/963-default-range-smali/smali/iface.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface iface { -# public default String SayHi(String n1, -# String n2, -# String n3, -# String n4, -# String n5, -# String n6, -# String n7, -# String n8, -# String n9, -# String n0) { -# return "Hello"; -# } -# } - -.class public abstract interface Liface; -.super Ljava/lang/Object; - -.method public SayHi(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - .locals 1 - const-string v0, "Hello" - return-object v0 -.end method - diff --git a/test/963-default-range-smali/src/A.java b/test/963-default-range-smali/src/A.java new file mode 100644 index 0000000000..617eccba49 --- /dev/null +++ b/test/963-default-range-smali/src/A.java @@ -0,0 +1,16 @@ +/* + * Copyright 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class A implements Iface { } diff --git a/test/963-default-range-smali/src/Iface.java b/test/963-default-range-smali/src/Iface.java new file mode 100644 index 0000000000..7556209b54 --- /dev/null +++ b/test/963-default-range-smali/src/Iface.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String SayHi(String n1, + String n2, + String n3, + String n4, + String n5, + String n6, + String n7, + String n8, + String n9, + String n0) { + return "Hello"; + } +} diff --git a/test/963-default-range-smali/src/Main.java b/test/963-default-range-smali/src/Main.java new file mode 100644 index 0000000000..841842dc12 --- /dev/null +++ b/test/963-default-range-smali/src/Main.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Main { + public static void main(String[] args) { + A a = new A(); + System.out.println(a.SayHi("a string 0", + "a string 1", + "a string 2", + "a string 3", + "a string 4", + "a string 5", + "a string 6", + "a string 7", + "a string 8", + "a string 9")); + Iface b = a; + System.out.println(b.SayHi("a string 0", + "a string 1", + "a string 2", + "a string 3", + "a string 4", + "a string 5", + "a string 6", + "a string 7", + "a string 8", + "a string 9")); + } +} diff --git a/test/964-default-iface-init-generated/build b/test/964-default-iface-init-generated/build index 0780da14e2..ccebbe4ac9 100755 --- a/test/964-default-iface-init-generated/build +++ b/test/964-default-iface-init-generated/build @@ -26,30 +26,19 @@ restore_ulimit() { } trap 'restore_ulimit' ERR -# Generate the smali files and expected.txt or fail -./util-src/generate_smali.py ./smali ./expected.txt - -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi +mkdir -p ./src + +# Generate the smali files and expected.txt or fail +./util-src/generate_java.py ./src ./expected.txt -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods # Reset the ulimit back to its initial value restore_ulimit diff --git a/test/964-default-iface-init-generated/smali/Displayer.smali b/test/964-default-iface-init-generated/smali/Displayer.smali deleted file mode 100644 index 91280a8a42..0000000000 --- a/test/964-default-iface-init-generated/smali/Displayer.smali +++ /dev/null @@ -1,45 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# // This class is b/c java does not allow static {} blocks in interfaces. -# public class Displayer { -# public Displayer(String type) { -# System.out.println("initialization of " + type); -# } -# public void touch() { -# return; -# } -# } - -.class public LDisplayer; -.super Ljava/lang/Object; - -.method public constructor <init>(Ljava/lang/String;)V - .locals 2 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - const-string v0, "initialization of " - invoke-virtual {v0, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - return-void -.end method - -.method public touch()V - .locals 0 - return-void -.end method - diff --git a/test/964-default-iface-init-generated/src/Displayer.java b/test/964-default-iface-init-generated/src/Displayer.java new file mode 100644 index 0000000000..4be0ab2732 --- /dev/null +++ b/test/964-default-iface-init-generated/src/Displayer.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// This class is b/c java does not allow static {} blocks in interfaces. +public class Displayer { + public Displayer(String type) { + System.out.println("initialization of " + type); + } + public void touch() { + return; + } +} diff --git a/test/964-default-iface-init-generated/util-src/generate_smali.py b/test/964-default-iface-init-generated/util-src/generate_java.py index c0ba157109..b2df49f70e 100755 --- a/test/964-default-iface-init-generated/util-src/generate_smali.py +++ b/test/964-default-iface-init-generated/util-src/generate_java.py @@ -15,7 +15,7 @@ # limitations under the License. """ -Generate Smali test files for test 964. +Generate java test files for test 964. """ import os @@ -40,47 +40,27 @@ import string # The max depth the tree can have. MAX_IFACE_DEPTH = 3 -class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): +class MainClass(mixins.DumpMixin, mixins.Named, mixins.JavaFileMixin): """ - A Main.smali file containing the Main class and the main function. It will run + A Main.java file containing the Main class and the main function. It will run all the test functions we have. """ MAIN_CLASS_TEMPLATE = """{copyright} - -.class public LMain; -.super Ljava/lang/Object; - -# class Main {{ - -.method public constructor <init>()V - .registers 1 - invoke-direct {{p0}}, Ljava/lang/Object;-><init>()V - return-void -.end method - +class Main {{ {test_groups} - {main_func} - -# }} +}} """ MAIN_FUNCTION_TEMPLATE = """ -# public static void main(String[] args) {{ -.method public static main([Ljava/lang/String;)V - .locals 2 - + public static void main(String[] args) {{ {test_group_invoke} - - return-void -.end method -# }} + }} """ TEST_GROUP_INVOKE_TEMPLATE = """ -# {test_name}(); - invoke-static {{}}, {test_name}()V + {test_name}(); """ def __init__(self): @@ -110,7 +90,7 @@ class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): def __str__(self): """ - Print the smali code for this test. + Print the java code for this test. """ all_tests = sorted(self.tests) test_invoke = "" @@ -121,7 +101,7 @@ class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): test_invoke += self.TEST_GROUP_INVOKE_TEMPLATE.format(test_name=t.get_name()) main_func = self.MAIN_FUNCTION_TEMPLATE.format(test_group_invoke=test_invoke) - return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright('smali'), + return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright('java'), test_groups = test_groups, main_func = main_func) @@ -132,46 +112,19 @@ class Func(mixins.Named, mixins.NameComparableMixin): """ TEST_FUNCTION_TEMPLATE = """ -# public static void {fname}() {{ -# try {{ -# System.out.println("About to initialize {tree}"); -# {farg} v = new {farg}(); -# System.out.println("Initialized {tree}"); -# v.touchAll(); -# System.out.println("All of {tree} hierarchy initialized"); -# return; -# }} catch (Error e) {{ -# e.printStackTrace(System.out); -# return; -# }} -# }} -.method public static {fname}()V - .locals 7 - :call_{fname}_try_start - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v3, "About to initialize {tree}" - invoke-virtual {{v2, v3}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - new-instance v6, L{farg}; - invoke-direct {{v6}}, L{farg};-><init>()V - - const-string v3, "Initialized {tree}" - invoke-virtual {{v2, v3}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {{v6}}, L{farg};->touchAll()V - - const-string v3, "All of {tree} hierarchy initialized" - invoke-virtual {{v2, v3}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void - :call_{fname}_try_end - .catch Ljava/lang/Error; {{:call_{fname}_try_start .. :call_{fname}_try_end}} :error_{fname}_start - :error_{fname}_start - move-exception v3 - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - invoke-virtual {{v3,v2}}, Ljava/lang/Error;->printStackTrace(Ljava/io/PrintStream;)V - return-void -.end method + public static void {fname}() {{ + try {{ + System.out.println("About to initialize {tree}"); + {farg} v = new {farg}(); + System.out.println("Initialized {tree}"); + v.touchAll(); + System.out.println("All of {tree} hierarchy initialized"); + return; + }} catch (Error e) {{ + e.printStackTrace(System.out); + return; + }} + }} """ OUTPUT_FORMAT = """ @@ -190,7 +143,7 @@ All of {tree} hierarchy initialized def __str__(self): """ - Print the smali code for this test function. + Print the java code for this test function. """ return self.TEST_FUNCTION_TEMPLATE.format(fname=self.get_name(), farg=self.farg.get_name(), @@ -211,57 +164,26 @@ All of {tree} hierarchy initialized initialize_output = self.farg.get_initialize_output().strip(), touch_output = self.farg.get_touch_output().strip()) -class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.SmaliFileMixin): +class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.JavaFileMixin): """ A class that will be instantiated to test interface initialization order. """ TEST_CLASS_TEMPLATE = """{copyright} - -.class public L{class_name}; -.super Ljava/lang/Object; -{implements_spec} - -# public class {class_name} implements {ifaces} {{ -# -# public {class_name}() {{ -# }} -.method public constructor <init>()V - .locals 2 - invoke-direct {{p0}}, Ljava/lang/Object;-><init>()V - return-void -.end method - -# public void marker() {{ -# return; -# }} -.method public marker()V - .locals 0 - return-void -.end method - -# public void touchAll() {{ -.method public touchAll()V - .locals 2 - sget-object v0, Ljava/lang/System;->out:Ljava/io/PrintStream; - {touch_calls} - return-void -.end method -# }} -# }} -""" - - IMPLEMENTS_TEMPLATE = """ -.implements L{iface_name}; +public class {class_name} implements {ifaces} {{ + public void marker() {{ + return; + }} + + public void touchAll() {{ +{touch_calls} + }} +}} """ TOUCH_CALL_TEMPLATE = """ -# System.out.println("{class_name} touching {iface_name}"); -# {iface_name}.field.touch(); - const-string v1, "{class_name} touching {iface_name}" - invoke-virtual {{v0, v1}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - sget-object v1, L{iface_name};->field:LDisplayer; - invoke-virtual {{v1}}, LDisplayer;->touch()V + System.out.println("{class_name} touching {iface_name}"); + {iface_name}.field.touch(); """ TOUCH_OUTPUT_TEMPLATE = """ @@ -306,63 +228,32 @@ class TestClass(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixi def __str__(self): """ - Print the smali code for this class. + Print the java code for this class. """ - s_ifaces = '\n'.join(map(lambda a: self.IMPLEMENTS_TEMPLATE.format(iface_name = a.get_name()), - self.ifaces)) j_ifaces = ', '.join(map(lambda a: a.get_name(), self.ifaces)) touches = '\n'.join(map(lambda a: self.TOUCH_CALL_TEMPLATE.format(class_name = self.class_name, iface_name = a.get_name()), self.get_all_interfaces())) - return self.TEST_CLASS_TEMPLATE.format(copyright = get_copyright('smali'), - implements_spec = s_ifaces, + return self.TEST_CLASS_TEMPLATE.format(copyright = get_copyright('java'), ifaces = j_ifaces, class_name = self.class_name, touch_calls = touches) -class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.SmaliFileMixin): +class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, mixins.JavaFileMixin): """ An interface that will be used to test default method resolution order. """ TEST_INTERFACE_TEMPLATE = """{copyright} -.class public abstract interface L{class_name}; -.super Ljava/lang/Object; -{implements_spec} - -# public interface {class_name} {extends} {ifaces} {{ -# public static final Displayer field = new Displayer("{tree}"); -.field public final static field:LDisplayer; - -.method static constructor <clinit>()V - .locals 3 - const-string v2, "{tree}" - new-instance v1, LDisplayer; - invoke-direct {{v1, v2}}, LDisplayer;-><init>(Ljava/lang/String;)V - sput-object v1, L{class_name};->field:LDisplayer; - return-void -.end method - -# public void marker(); -.method public abstract marker()V -.end method - +public interface {class_name} {extends} {ifaces} {{ + public static final Displayer field = new Displayer("{tree}"); + public void marker(); {funcs} - -# }} +}} """ DEFAULT_FUNC_TEMPLATE = """ -# public default void {class_name}_DEFAULT_FUNC() {{ -# return; -# }} -.method public {class_name}_DEFAULT_FUNC()V - .locals 0 - return-void -.end method -""" - IMPLEMENTS_TEMPLATE = """ -.implements L{iface_name}; + public default void {class_name}_DEFAULT_FUNC() {{ return; }} """ OUTPUT_TEMPLATE = "initialization of {tree}" @@ -429,17 +320,14 @@ class TestInterface(mixins.DumpMixin, mixins.Named, mixins.NameComparableMixin, def __str__(self): """ - Print the smali code for this interface. + Print the java code for this interface. """ - s_ifaces = '\n'.join(map(lambda a: self.IMPLEMENTS_TEMPLATE.format(iface_name = a.get_name()), - self.ifaces)) j_ifaces = ', '.join(map(lambda a: a.get_name(), self.ifaces)) if self.default: funcs = self.DEFAULT_FUNC_TEMPLATE.format(class_name = self.class_name) else: funcs = "" - return self.TEST_INTERFACE_TEMPLATE.format(copyright = get_copyright('smali'), - implements_spec = s_ifaces, + return self.TEST_INTERFACE_TEMPLATE.format(copyright = get_copyright('java'), extends = "extends" if len(self.ifaces) else "", ifaces = j_ifaces, funcs = funcs, @@ -516,16 +404,16 @@ def create_all_test_files(): return mc, classes def main(argv): - smali_dir = Path(argv[1]) - if not smali_dir.exists() or not smali_dir.is_dir(): - print("{} is not a valid smali dir".format(smali_dir), file=sys.stderr) + java_dir = Path(argv[1]) + if not java_dir.exists() or not java_dir.is_dir(): + print("{} is not a valid java dir".format(java_dir), file=sys.stderr) sys.exit(1) expected_txt = Path(argv[2]) mainclass, all_files = create_all_test_files() with expected_txt.open('w') as out: print(mainclass.get_expected(), file=out) for f in all_files: - f.dump(smali_dir) + f.dump(java_dir) if __name__ == '__main__': main(sys.argv) diff --git a/test/965-default-verify/build b/test/965-default-verify/build index 5ba54380df..0dd8573f54 100755 --- a/test/965-default-verify/build +++ b/test/965-default-verify/build @@ -17,32 +17,11 @@ # make us exit on a failure set -e -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling Java code, create it. - mkdir -p src - mkdir -p src2 - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Move build-src to src and the src copies to src2. This is needed because of - # how our default build script works and we wanted the java and smali code - # to be the same in the smali files. - for f in `find ./build-src -type f -name "*.java" | xargs -i basename \{\}`; do - mv ./src/$f ./src2/$f - mv ./build-src/$f ./src/$f - done - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi - -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods diff --git a/test/965-default-verify/smali/Iface.smali b/test/965-default-verify/smali/Iface.smali deleted file mode 100644 index 74799a6cf3..0000000000 --- a/test/965-default-verify/smali/Iface.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface { -# public default String sayHi() { -# return "Hello"; -# } -# -# public default void verificationSoftFail() { -# Statics.nonexistantFunction(); -# } -# } - -.class public abstract interface LIface; -.super Ljava/lang/Object; - -.method public sayHi()Ljava/lang/String; - .locals 1 - const-string v0, "Hello" - return-object v0 -.end method - -.method public verificationSoftFail()V - .locals 1 - invoke-static {}, LStatics;->nonexistantFunction()V - return-void -.end method diff --git a/test/965-default-verify/smali/Main.smali b/test/965-default-verify/smali/Main.smali deleted file mode 100644 index 8e9070692d..0000000000 --- a/test/965-default-verify/smali/Main.smali +++ /dev/null @@ -1,179 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Main implements Iface { -# public static void main(String[] args) { -# System.out.println("Create Main instance"); -# Main m = new Main(); -# System.out.println("Calling functions on concrete Main"); -# callMain(m); -# System.out.println("Calling functions on interface Iface"); -# callIface(m); -# } -# -# public static void callMain(Main m) { -# System.out.println("Calling verifiable function on Main"); -# System.out.println(m.sayHi()); -# System.out.println("Calling unverifiable function on Main"); -# try { -# m.verificationSoftFail(); -# System.out.println("Unexpected no error Thrown on Main"); -# } catch (NoSuchMethodError e) { -# System.out.println("Expected NSME Thrown on Main"); -# } catch (Throwable e) { -# System.out.println("Unexpected Error Thrown on Main"); -# e.printStackTrace(System.out); -# } -# System.out.println("Calling verifiable function on Main"); -# System.out.println(m.sayHi()); -# return; -# } -# -# public static void callIface(Iface m) { -# System.out.println("Calling verifiable function on Iface"); -# System.out.println(m.sayHi()); -# System.out.println("Calling unverifiable function on Iface"); -# try { -# m.verificationSoftFail(); -# System.out.println("Unexpected no error Thrown on Iface"); -# } catch (NoSuchMethodError e) { -# System.out.println("Expected NSME Thrown on Iface"); -# } catch (Throwable e) { -# System.out.println("Unexpected Error Thrown on Iface"); -# e.printStackTrace(System.out); -# } -# System.out.println("Calling verifiable function on Iface"); -# System.out.println(m.sayHi()); -# return; -# } -# } - -.class public LMain; -.super Ljava/lang/Object; -.implements LIface; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public static main([Ljava/lang/String;)V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - - const-string v0, "Create Main instance" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - new-instance v2, LMain; - invoke-direct {v2}, LMain;-><init>()V - - const-string v0, "Calling functions on concrete Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callMain(LMain;)V - - const-string v0, "Calling functions on interface Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callIface(LIface;)V - - return-void -.end method - -.method public static callIface(LIface;)V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling verifiable function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling unverifiable function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-interface {p0}, LIface;->verificationSoftFail()V - - const-string v0, "Unexpected no error Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/NoSuchMethodError; {:try_start .. :try_end} :NSME_error_start - .catch Ljava/lang/Throwable; {:try_start .. :try_end} :other_error_start - :NSME_error_start - const-string v0, "Expected NSME Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :other_error_start - move-exception v2 - const-string v0, "Unexpected Error Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-virtual {v2,v1}, Ljava/lang/Throwable;->printStackTrace(Ljava/io/PrintStream;)V - goto :error_end - :error_end - const-string v0, "Calling verifiable function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method - -.method public static callMain(LMain;)V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling verifiable function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling unverifiable function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-virtual {p0}, LMain;->verificationSoftFail()V - - const-string v0, "Unexpected no error Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/NoSuchMethodError; {:try_start .. :try_end} :NSME_error_start - .catch Ljava/lang/Throwable; {:try_start .. :try_end} :other_error_start - :NSME_error_start - const-string v0, "Expected NSME Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :other_error_start - move-exception v2 - const-string v0, "Unexpected Error Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-virtual {v2,v1}, Ljava/lang/Throwable;->printStackTrace(Ljava/io/PrintStream;)V - goto :error_end - :error_end - const-string v0, "Calling verifiable function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method diff --git a/test/965-default-verify/smali/Statics.smali b/test/965-default-verify/smali/Statics.smali deleted file mode 100644 index 1e8cac034a..0000000000 --- a/test/965-default-verify/smali/Statics.smali +++ /dev/null @@ -1,30 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Statics { -# // public static void nonexistantFunction() { -# // System.out.println("I don't exist"); -# // } -# } -# -.class public LStatics; -.super Ljava/lang/Object; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method diff --git a/test/965-default-verify/src/Iface.java b/test/965-default-verify/src/Iface.java new file mode 100644 index 0000000000..180fba2833 --- /dev/null +++ b/test/965-default-verify/src/Iface.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String sayHi() { + return "Hello"; + } + public default void verificationSoftFail() { + Statics.nonexistantFunction(); + } +} diff --git a/test/965-default-verify/src/Main.java b/test/965-default-verify/src/Main.java new file mode 100644 index 0000000000..6374cb5aa0 --- /dev/null +++ b/test/965-default-verify/src/Main.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Main implements Iface { + public static void main(String[] args) { + System.out.println("Create Main instance"); + Main m = new Main(); + System.out.println("Calling functions on concrete Main"); + callMain(m); + System.out.println("Calling functions on interface Iface"); + callIface(m); + } + + public static void callMain(Main m) { + System.out.println("Calling verifiable function on Main"); + System.out.println(m.sayHi()); + System.out.println("Calling unverifiable function on Main"); + try { + m.verificationSoftFail(); + System.out.println("Unexpected no error Thrown on Main"); + } catch (NoSuchMethodError e) { + System.out.println("Expected NSME Thrown on Main"); + } catch (Throwable e) { + System.out.println("Unexpected Error Thrown on Main"); + e.printStackTrace(System.out); + } + System.out.println("Calling verifiable function on Main"); + System.out.println(m.sayHi()); + return; + } + + public static void callIface(Iface m) { + System.out.println("Calling verifiable function on Iface"); + System.out.println(m.sayHi()); + System.out.println("Calling unverifiable function on Iface"); + try { + m.verificationSoftFail(); + System.out.println("Unexpected no error Thrown on Iface"); + } catch (NoSuchMethodError e) { + System.out.println("Expected NSME Thrown on Iface"); + } catch (Throwable e) { + System.out.println("Unexpected Error Thrown on Iface"); + e.printStackTrace(System.out); + } + System.out.println("Calling verifiable function on Iface"); + System.out.println(m.sayHi()); + return; + } +} diff --git a/test/965-default-verify/build-src/Statics.java b/test/965-default-verify/src/Statics.java index 300aeecca7..2e17ba4174 100644 --- a/test/965-default-verify/build-src/Statics.java +++ b/test/965-default-verify/src/Statics.java @@ -16,7 +16,7 @@ class Statics { public static void nonexistantFunction() { - System.out.println("I don't exist"); + System.out.println("I don't exist"); } } diff --git a/test/965-default-verify/src2/Statics.java b/test/965-default-verify/src2/Statics.java new file mode 100644 index 0000000000..7899ca9c5e --- /dev/null +++ b/test/965-default-verify/src2/Statics.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Statics { + // public static void nonexistantFunction() { + // System.out.println("I don't exist"); + // } +} diff --git a/test/966-default-conflict/build b/test/966-default-conflict/build index e66e8409c6..0dd8573f54 100755 --- a/test/966-default-conflict/build +++ b/test/966-default-conflict/build @@ -17,18 +17,11 @@ # make us exit on a failure set -e -# TODO: Support running with jack. - -if [[ $@ == *"--jvm"* ]]; then - # Build the Java files if we are running a --jvm test - mkdir -p src - mkdir -p classes - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Build with the non-conflicting version - ${JAVAC} -implicit:none -d classes src/Iface.java build-src/Iface2.java src/Main.java - rm classes/Iface2.class - # Build with the conflicting version - ${JAVAC} -implicit:none -cp classes -d classes src/Iface2.java -else - ./default-build "$@" --experimental default-methods +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi + +./default-build "$@" --experimental default-methods diff --git a/test/966-default-conflict/smali/Iface.smali b/test/966-default-conflict/smali/Iface.smali deleted file mode 100644 index e996b3a4f4..0000000000 --- a/test/966-default-conflict/smali/Iface.smali +++ /dev/null @@ -1,39 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface { -# public default String sayHi() { -# return "Hi"; -# } -# public default String charge() { -# return "CHARGE"; -# } -# } - -.class public abstract interface LIface; -.super Ljava/lang/Object; - -.method public sayHi()Ljava/lang/String; - .locals 1 - const-string v0, "Hi" - return-object v0 -.end method - -.method public charge()Ljava/lang/String; - .locals 1 - const-string v0, "CHARGE" - return-object v0 -.end method diff --git a/test/966-default-conflict/smali/Iface2.smali b/test/966-default-conflict/smali/Iface2.smali deleted file mode 100644 index 82fa547dea..0000000000 --- a/test/966-default-conflict/smali/Iface2.smali +++ /dev/null @@ -1,31 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface2 { -# public default String sayHi() { -# return "hello"; -# } -# } - -.class public abstract interface LIface2; -.super Ljava/lang/Object; - -.method public sayHi()Ljava/lang/String; - .locals 1 - const-string v0, "hello" - return-object v0 -.end method - diff --git a/test/966-default-conflict/smali/Main.smali b/test/966-default-conflict/smali/Main.smali deleted file mode 100644 index ce974d8135..0000000000 --- a/test/966-default-conflict/smali/Main.smali +++ /dev/null @@ -1,227 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Main implements Iface, Iface2 { -# public static void main(String[] args) { -# System.out.println("Create Main instance"); -# Main m = new Main(); -# System.out.println("Calling functions on concrete Main"); -# callMain(m); -# System.out.println("Calling functions on interface Iface"); -# callIface(m); -# System.out.println("Calling functions on interface Iface2"); -# callIface2(m); -# } -# -# public static void callMain(Main m) { -# System.out.println("Calling non-conflicting function on Main"); -# System.out.println(m.charge()); -# System.out.println("Calling conflicting function on Main"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Main"); -# } catch (AbstractMethodError e) { -# System.out.println("Unexpected AME Thrown on Main"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Expected ICCE Thrown on Main"); -# } -# System.out.println("Calling non-conflicting function on Main"); -# System.out.println(m.charge()); -# return; -# } -# -# public static void callIface(Iface m) { -# System.out.println("Calling non-conflicting function on Iface"); -# System.out.println(m.charge()); -# System.out.println("Calling conflicting function on Iface"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Iface"); -# } catch (AbstractMethodError e) { -# System.out.println("Unexpected AME Thrown on Iface"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Expected ICCE Thrown on Iface"); -# } -# System.out.println("Calling non-conflicting function on Iface"); -# System.out.println(m.charge()); -# return; -# } -# -# public static void callIface2(Iface2 m) { -# System.out.println("Calling conflicting function on Iface2"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Iface2"); -# } catch (AbstractMethodError e) { -# System.out.println("Unexpected AME Thrown on Iface2"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Expected ICCE Thrown on Iface2"); -# } -# return; -# } -# } - -.class public LMain; -.super Ljava/lang/Object; -.implements LIface; -.implements LIface2; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public static main([Ljava/lang/String;)V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - - const-string v0, "Create Main instance" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - new-instance v2, LMain; - invoke-direct {v2}, LMain;-><init>()V - - const-string v0, "Calling functions on concrete Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callMain(LMain;)V - - const-string v0, "Calling functions on interface Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callIface(LIface;)V - - const-string v0, "Calling functions on interface Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callIface2(LIface2;)V - - return-void -.end method - -.method public static callIface(LIface;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling non-conflicting function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling conflicting function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-interface {p0}, LIface;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Unexpected AME Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Expected ICCE Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - const-string v0, "Calling non-conflicting function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method - -.method public static callIface2(LIface2;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling conflicting function on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-interface {p0}, LIface2;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Unexpected AME Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Expected ICCE Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - - return-void -.end method - -.method public static callMain(LMain;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling non-conflicting function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling conflicting function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-virtual {p0}, LMain;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Unexpected AME Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Expected ICCE Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - const-string v0, "Calling non-conflicting function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method diff --git a/test/966-default-conflict/src/Iface.java b/test/966-default-conflict/src/Iface.java new file mode 100644 index 0000000000..2131ed878d --- /dev/null +++ b/test/966-default-conflict/src/Iface.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String sayHi() { + return "Hi"; + } + public default String charge() { + return "CHARGE"; + } +} diff --git a/test/966-default-conflict/build-src/Iface2.java b/test/966-default-conflict/src/Iface2.java index 8d97df8385..8d97df8385 100644 --- a/test/966-default-conflict/build-src/Iface2.java +++ b/test/966-default-conflict/src/Iface2.java diff --git a/test/966-default-conflict/src/Main.java b/test/966-default-conflict/src/Main.java new file mode 100644 index 0000000000..ce8cb47209 --- /dev/null +++ b/test/966-default-conflict/src/Main.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Main implements Iface, Iface2 { + public static void main(String[] args) { + System.out.println("Create Main instance"); + Main m = new Main(); + System.out.println("Calling functions on concrete Main"); + callMain(m); + System.out.println("Calling functions on interface Iface"); + callIface(m); + System.out.println("Calling functions on interface Iface2"); + callIface2(m); + } + public static void callMain(Main m) { + System.out.println("Calling non-conflicting function on Main"); + System.out.println(m.charge()); + System.out.println("Calling conflicting function on Main"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Main"); + } catch (AbstractMethodError e) { + System.out.println("Unexpected AME Thrown on Main"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Expected ICCE Thrown on Main"); + } + System.out.println("Calling non-conflicting function on Main"); + System.out.println(m.charge()); + return; + } + public static void callIface(Iface m) { + System.out.println("Calling non-conflicting function on Iface"); + System.out.println(m.charge()); + System.out.println("Calling conflicting function on Iface"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Iface"); + } catch (AbstractMethodError e) { + System.out.println("Unexpected AME Thrown on Iface"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Expected ICCE Thrown on Iface"); + } + System.out.println("Calling non-conflicting function on Iface"); + System.out.println(m.charge()); + return; + } + public static void callIface2(Iface2 m) { + System.out.println("Calling conflicting function on Iface2"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Iface2"); + } catch (AbstractMethodError e) { + System.out.println("Unexpected AME Thrown on Iface2"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Expected ICCE Thrown on Iface2"); + } + return; + } +} diff --git a/test/966-default-conflict/src2/Iface2.java b/test/966-default-conflict/src2/Iface2.java new file mode 100644 index 0000000000..d29033cd93 --- /dev/null +++ b/test/966-default-conflict/src2/Iface2.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface2 { + public default String sayHi() { + return "hello"; + } +} diff --git a/test/967-default-ame/build b/test/967-default-ame/build index 53001a9ad2..0dd8573f54 100755 --- a/test/967-default-ame/build +++ b/test/967-default-ame/build @@ -17,19 +17,11 @@ # make us exit on a failure set -e -# TODO: Support running with jack. - -if [[ $@ == *"--jvm"* ]]; then - # Build the Java files if we are running a --jvm test - mkdir -p src - mkdir -p classes - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Build with the non-conflicting version - ${JAVAC} -implicit:none -d classes src/Iface.java build-src/Iface2.java build-src/Iface3.java src/Main.java - rm classes/Iface2.class - rm classes/Iface3.class - # Build with the conflicting version - ${JAVAC} -implicit:none -cp classes -d classes src/Iface2.java src/Iface3.java -else - ./default-build "$@" --experimental default-methods +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi + +./default-build "$@" --experimental default-methods diff --git a/test/967-default-ame/smali/Iface.smali b/test/967-default-ame/smali/Iface.smali deleted file mode 100644 index e996b3a4f4..0000000000 --- a/test/967-default-ame/smali/Iface.smali +++ /dev/null @@ -1,39 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface { -# public default String sayHi() { -# return "Hi"; -# } -# public default String charge() { -# return "CHARGE"; -# } -# } - -.class public abstract interface LIface; -.super Ljava/lang/Object; - -.method public sayHi()Ljava/lang/String; - .locals 1 - const-string v0, "Hi" - return-object v0 -.end method - -.method public charge()Ljava/lang/String; - .locals 1 - const-string v0, "CHARGE" - return-object v0 -.end method diff --git a/test/967-default-ame/smali/Iface2.smali b/test/967-default-ame/smali/Iface2.smali deleted file mode 100644 index a21a8ddbc7..0000000000 --- a/test/967-default-ame/smali/Iface2.smali +++ /dev/null @@ -1,27 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface2 extends Iface { -# public String sayHi(); -# } - -.class public abstract interface LIface2; -.super Ljava/lang/Object; -.implements LIface; - -.method public abstract sayHi()Ljava/lang/String; -.end method - diff --git a/test/967-default-ame/smali/Iface3.smali b/test/967-default-ame/smali/Iface3.smali deleted file mode 100644 index 874e96d069..0000000000 --- a/test/967-default-ame/smali/Iface3.smali +++ /dev/null @@ -1,26 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface Iface3 { -# public String charge(); -# } - -.class public abstract interface LIface3; -.super Ljava/lang/Object; - -.method public abstract charge()Ljava/lang/String; -.end method - diff --git a/test/967-default-ame/smali/Main.smali b/test/967-default-ame/smali/Main.smali deleted file mode 100644 index e4d63cfa24..0000000000 --- a/test/967-default-ame/smali/Main.smali +++ /dev/null @@ -1,228 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# class Main implements Iface, Iface2, Iface3 { -# public static void main(String[] args) { -# System.out.println("Create Main instance"); -# Main m = new Main(); -# System.out.println("Calling functions on concrete Main"); -# callMain(m); -# System.out.println("Calling functions on interface Iface"); -# callIface(m); -# System.out.println("Calling functions on interface Iface2"); -# callIface2(m); -# } -# -# public static void callMain(Main m) { -# System.out.println("Calling non-abstract function on Main"); -# System.out.println(m.charge()); -# System.out.println("Calling abstract function on Main"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Main"); -# } catch (AbstractMethodError e) { -# System.out.println("Expected AME Thrown on Main"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Unexpected ICCE Thrown on Main"); -# } -# System.out.println("Calling non-abstract function on Main"); -# System.out.println(m.charge()); -# return; -# } -# -# public static void callIface(Iface m) { -# System.out.println("Calling non-abstract function on Iface"); -# System.out.println(m.charge()); -# System.out.println("Calling abstract function on Iface"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Iface"); -# } catch (AbstractMethodError e) { -# System.out.println("Expected AME Thrown on Iface"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Unexpected ICCE Thrown on Iface"); -# } -# System.out.println("Calling non-abstract function on Iface"); -# System.out.println(m.charge()); -# return; -# } -# -# public static void callIface2(Iface2 m) { -# System.out.println("Calling abstract function on Iface2"); -# try { -# System.out.println(m.sayHi()); -# System.out.println("Unexpected no error Thrown on Iface2"); -# } catch (AbstractMethodError e) { -# System.out.println("Expected AME Thrown on Iface2"); -# } catch (IncompatibleClassChangeError e) { -# System.out.println("Unexpected ICCE Thrown on Iface2"); -# } -# return; -# } -# } - -.class public LMain; -.super Ljava/lang/Object; -.implements LIface; -.implements LIface2; -.implements LIface3; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public static main([Ljava/lang/String;)V - .locals 3 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - - const-string v0, "Create Main instance" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - new-instance v2, LMain; - invoke-direct {v2}, LMain;-><init>()V - - const-string v0, "Calling functions on concrete Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callMain(LMain;)V - - const-string v0, "Calling functions on interface Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callIface(LIface;)V - - const-string v0, "Calling functions on interface Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - invoke-static {v2}, LMain;->callIface2(LIface2;)V - - return-void -.end method - -.method public static callIface(LIface;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling non-abstract function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling abstract function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-interface {p0}, LIface;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Expected AME Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Unexpected ICCE Thrown on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - const-string v0, "Calling non-abstract function on Iface" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-interface {p0}, LIface;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method - -.method public static callIface2(LIface2;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling abstract function on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-interface {p0}, LIface2;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Expected AME Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Unexpected ICCE Thrown on Iface2" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - - return-void -.end method - -.method public static callMain(LMain;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Calling non-abstract function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Calling abstract function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - :try_start - invoke-virtual {p0}, LMain;->sayHi()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "Unexpected no error Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - goto :error_end - :try_end - .catch Ljava/lang/AbstractMethodError; {:try_start .. :try_end} :AME_error_start - .catch Ljava/lang/IncompatibleClassChangeError; {:try_start .. :try_end} :ICCE_error_start - :AME_error_start - const-string v0, "Expected AME Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :ICCE_error_start - const-string v0, "Unexpected ICCE Thrown on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - goto :error_end - :error_end - const-string v0, "Calling non-abstract function on Main" - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - invoke-virtual {p0}, LMain;->charge()Ljava/lang/String; - move-result-object v0 - invoke-virtual {v1,v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - return-void -.end method diff --git a/test/967-default-ame/src/Iface.java b/test/967-default-ame/src/Iface.java new file mode 100644 index 0000000000..2131ed878d --- /dev/null +++ b/test/967-default-ame/src/Iface.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String sayHi() { + return "Hi"; + } + public default String charge() { + return "CHARGE"; + } +} diff --git a/test/967-default-ame/build-src/Iface2.java b/test/967-default-ame/src/Iface2.java index 55b2ac01b0..55b2ac01b0 100644 --- a/test/967-default-ame/build-src/Iface2.java +++ b/test/967-default-ame/src/Iface2.java diff --git a/test/967-default-ame/build-src/Iface3.java b/test/967-default-ame/src/Iface3.java index a6faa451e5..a6faa451e5 100644 --- a/test/967-default-ame/build-src/Iface3.java +++ b/test/967-default-ame/src/Iface3.java diff --git a/test/967-default-ame/src/Main.java b/test/967-default-ame/src/Main.java new file mode 100644 index 0000000000..3e48062aba --- /dev/null +++ b/test/967-default-ame/src/Main.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Main implements Iface, Iface2, Iface3 { + public static void main(String[] args) { + System.out.println("Create Main instance"); + Main m = new Main(); + System.out.println("Calling functions on concrete Main"); + callMain(m); + System.out.println("Calling functions on interface Iface"); + callIface(m); + System.out.println("Calling functions on interface Iface2"); + callIface2(m); + } + public static void callMain(Main m) { + System.out.println("Calling non-abstract function on Main"); + System.out.println(m.charge()); + System.out.println("Calling abstract function on Main"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Main"); + } catch (AbstractMethodError e) { + System.out.println("Expected AME Thrown on Main"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Unexpected ICCE Thrown on Main"); + } + System.out.println("Calling non-abstract function on Main"); + System.out.println(m.charge()); + return; + } + public static void callIface(Iface m) { + System.out.println("Calling non-abstract function on Iface"); + System.out.println(m.charge()); + System.out.println("Calling abstract function on Iface"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Iface"); + } catch (AbstractMethodError e) { + System.out.println("Expected AME Thrown on Iface"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Unexpected ICCE Thrown on Iface"); + } + System.out.println("Calling non-abstract function on Iface"); + System.out.println(m.charge()); + return; + } + public static void callIface2(Iface2 m) { + System.out.println("Calling abstract function on Iface2"); + try { + System.out.println(m.sayHi()); + System.out.println("Unexpected no error Thrown on Iface2"); + } catch (AbstractMethodError e) { + System.out.println("Expected AME Thrown on Iface2"); + } catch (IncompatibleClassChangeError e) { + System.out.println("Unexpected ICCE Thrown on Iface2"); + } + return; + } +} diff --git a/test/967-default-ame/src2/Iface.java b/test/967-default-ame/src2/Iface.java new file mode 100644 index 0000000000..2131ed878d --- /dev/null +++ b/test/967-default-ame/src2/Iface.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String sayHi() { + return "Hi"; + } + public default String charge() { + return "CHARGE"; + } +} diff --git a/test/967-default-ame/src2/Iface2.java b/test/967-default-ame/src2/Iface2.java new file mode 100644 index 0000000000..0e4fb5f2aa --- /dev/null +++ b/test/967-default-ame/src2/Iface2.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface2 extends Iface { + public String sayHi(); +} diff --git a/test/967-default-ame/src2/Iface3.java b/test/967-default-ame/src2/Iface3.java new file mode 100644 index 0000000000..70fc33ba93 --- /dev/null +++ b/test/967-default-ame/src2/Iface3.java @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface3 { + public String charge(); +} diff --git a/test/969-iface-super/build b/test/969-iface-super/build index b1ef320d05..e8f4ed084a 100755 --- a/test/969-iface-super/build +++ b/test/969-iface-super/build @@ -17,27 +17,14 @@ # make us exit on a failure set -e -# Should we compile with Java source code. By default we will use Smali. -USES_JAVA_SOURCE="false" -if [[ $@ == *"--jvm"* ]]; then - USES_JAVA_SOURCE="true" -elif [[ "$USE_JACK" == "true" ]]; then - if $JACK -D jack.java.source.version=1.8 2>/dev/null; then - USES_JAVA_SOURCE="true" - else - echo "WARNING: Cannot use jack because it does not support JLS 1.8. Falling back to smali" >&2 - fi +if [[ $@ != *"--jvm"* ]]; then + # Don't do anything with jvm + # Hard-wired use of experimental jack. + # TODO: fix this temporary work-around for default-methods, see b/19467889 + export USE_JACK=true fi -# Generate the smali Main.smali file or fail -${ANDROID_BUILD_TOP}/art/test/utils/python/generate_smali_main.py ./smali +# Generate the Main.java file or fail +${ANDROID_BUILD_TOP}/art/test/utils/python/generate_java_main.py ./src -if [[ "$USES_JAVA_SOURCE" == "true" ]]; then - # We are compiling java code, create it. - mkdir -p src - ${ANDROID_BUILD_TOP}/art/tools/extract-embedded-java ./smali ./src - # Ignore the smali directory. - EXTRA_ARGS="--no-smali" -fi - -./default-build "$@" "$EXTRA_ARGS" --experimental default-methods +./default-build "$@" --experimental default-methods diff --git a/test/969-iface-super/expected.txt b/test/969-iface-super/expected.txt index f310d10e12..f7a63d6b08 100644 --- a/test/969-iface-super/expected.txt +++ b/test/969-iface-super/expected.txt @@ -1,39 +1,39 @@ Testing for type A A-virtual A.SayHi()='Hello ' -A-interface iface.SayHi()='Hello ' +A-interface Iface.SayHi()='Hello ' End testing for type A Testing for type B B-virtual B.SayHi()='Hello Hello ' -B-interface iface.SayHi()='Hello Hello ' -B-interface iface2.SayHi()='Hello Hello ' +B-interface Iface.SayHi()='Hello Hello ' +B-interface Iface2.SayHi()='Hello Hello ' End testing for type B Testing for type C C-virtual C.SayHi()='Hello and welcome ' -C-interface iface.SayHi()='Hello and welcome ' +C-interface Iface.SayHi()='Hello and welcome ' End testing for type C Testing for type D D-virtual D.SayHi()='Hello Hello and welcome ' -D-interface iface.SayHi()='Hello Hello and welcome ' -D-interface iface2.SayHi()='Hello Hello and welcome ' +D-interface Iface.SayHi()='Hello Hello and welcome ' +D-interface Iface2.SayHi()='Hello Hello and welcome ' End testing for type D Testing for type E E-virtual E.SayHi()='Hello there!' -E-interface iface.SayHi()='Hello there!' -E-interface iface3.SayHi()='Hello there!' +E-interface Iface.SayHi()='Hello there!' +E-interface Iface3.SayHi()='Hello there!' End testing for type E Testing for type F F-virtual E.SayHi()='Hello there!' F-virtual F.SayHi()='Hello there!' -F-interface iface.SayHi()='Hello there!' -F-interface iface3.SayHi()='Hello there!' +F-interface Iface.SayHi()='Hello there!' +F-interface Iface3.SayHi()='Hello there!' F-virtual F.SaySurprisedHi()='Hello there!!' End testing for type F Testing for type G G-virtual E.SayHi()='Hello there!?' G-virtual F.SayHi()='Hello there!?' G-virtual G.SayHi()='Hello there!?' -G-interface iface.SayHi()='Hello there!?' -G-interface iface3.SayHi()='Hello there!?' +G-interface Iface.SayHi()='Hello there!?' +G-interface Iface3.SayHi()='Hello there!?' G-virtual F.SaySurprisedHi()='Hello there!!' G-virtual G.SaySurprisedHi()='Hello there!!' G-virtual G.SayVerySurprisedHi()='Hello there!!!' @@ -42,6 +42,6 @@ Testing for type H H-virtual H.SayConfusedHi()='Hello ?!' H-virtual A.SayHi()='Hello ?' H-virtual H.SayHi()='Hello ?' -H-interface iface.SayHi()='Hello ?' +H-interface Iface.SayHi()='Hello ?' H-virtual H.SaySurprisedHi()='Hello !' End testing for type H diff --git a/test/969-iface-super/smali/A.smali b/test/969-iface-super/smali/A.smali deleted file mode 100644 index e7760a1062..0000000000 --- a/test/969-iface-super/smali/A.smali +++ /dev/null @@ -1,28 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class A implements iface { -# } - -.class public LA; -.super Ljava/lang/Object; -.implements Liface; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method diff --git a/test/969-iface-super/smali/B.smali b/test/969-iface-super/smali/B.smali deleted file mode 100644 index e529d0534f..0000000000 --- a/test/969-iface-super/smali/B.smali +++ /dev/null @@ -1,28 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class B implements iface2 { -# } - -.class public LB; -.super Ljava/lang/Object; -.implements Liface2; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method diff --git a/test/969-iface-super/smali/C.smali b/test/969-iface-super/smali/C.smali deleted file mode 100644 index 6fbb0c4b0e..0000000000 --- a/test/969-iface-super/smali/C.smali +++ /dev/null @@ -1,41 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class C implements iface { -# public String SayHi() { -# return iface.super.SayHi() + " and welcome "; -# } -# } - -.class public LC; -.super Ljava/lang/Object; -.implements Liface; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, Liface;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, " and welcome " - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/D.smali b/test/969-iface-super/smali/D.smali deleted file mode 100644 index ecd4629584..0000000000 --- a/test/969-iface-super/smali/D.smali +++ /dev/null @@ -1,41 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class D implements iface2 { -# public String SayHi() { -# return iface2.super.SayHi() + " and welcome "; -# } -# } - -.class public LD; -.super Ljava/lang/Object; -.implements Liface2; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, Liface2;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, " and welcome " - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/E.smali b/test/969-iface-super/smali/E.smali deleted file mode 100644 index 558aaea5d6..0000000000 --- a/test/969-iface-super/smali/E.smali +++ /dev/null @@ -1,41 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class E implements iface3 { -# public String SayHi() { -# return iface3.super.SayHi() + " there!"; -# } -# } - -.class public LE; -.super Ljava/lang/Object; -.implements Liface3; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, Ljava/lang/Object;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, Liface3;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, " there!" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/F.smali b/test/969-iface-super/smali/F.smali deleted file mode 100644 index c402d5cdc9..0000000000 --- a/test/969-iface-super/smali/F.smali +++ /dev/null @@ -1,40 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class F extends E { -# public String SaySurprisedHi() { -# return super.SayHi() + "!"; -# } -# } - -.class public LF; -.super LE; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LE;-><init>()V - return-void -.end method - -.method public SaySurprisedHi()Ljava/lang/String; - .registers 2 - invoke-super {p0}, LE;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "!" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/G.smali b/test/969-iface-super/smali/G.smali deleted file mode 100644 index 45705e6d86..0000000000 --- a/test/969-iface-super/smali/G.smali +++ /dev/null @@ -1,53 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class G extends F { -# public String SayHi() { -# return super.SayHi() + "?"; -# } -# public String SayVerySurprisedHi() { -# return super.SaySurprisedHi() + "!"; -# } -# } - -.class public LG; -.super LF; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LF;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, LF;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "?" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method - -.method public SayVerySurprisedHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, LF;->SaySurprisedHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "!" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/H.smali b/test/969-iface-super/smali/H.smali deleted file mode 100644 index 12f246b8c3..0000000000 --- a/test/969-iface-super/smali/H.smali +++ /dev/null @@ -1,66 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public class H extends A { -# public String SayHi() { -# return super.SayHi() + "?"; -# } -# public String SaySurprisedHi() { -# return super.SayHi() + "!"; -# } -# public String SayConfusedHi() { -# return SayHi() + "!"; -# } -# } - -.class public LH; -.super LA; - -.method public constructor <init>()V - .registers 1 - invoke-direct {p0}, LA;-><init>()V - return-void -.end method - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, LA;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "?" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method - -.method public SaySurprisedHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, LA;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "!" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method - -.method public SayConfusedHi()Ljava/lang/String; - .locals 2 - invoke-virtual {p0}, LH;->SayHi()Ljava/lang/String; - move-result-object v0 - const-string v1, "!" - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/iface.smali b/test/969-iface-super/smali/iface.smali deleted file mode 100644 index 08bb93dd0c..0000000000 --- a/test/969-iface-super/smali/iface.smali +++ /dev/null @@ -1,30 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface iface { -# public default String SayHi() { -# return "Hello "; -# } -# } - -.class public abstract interface Liface; -.super Ljava/lang/Object; - -.method public SayHi()Ljava/lang/String; - .locals 1 - const-string v0, "Hello " - return-object v0 -.end method diff --git a/test/969-iface-super/smali/iface2.smali b/test/969-iface-super/smali/iface2.smali deleted file mode 100644 index ce6f86432d..0000000000 --- a/test/969-iface-super/smali/iface2.smali +++ /dev/null @@ -1,36 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface iface2 extends iface { -# public default String SayHi() { -# return iface.super.SayHi() + iface.super.SayHi(); -# } -# } - -.class public abstract interface Liface2; -.super Ljava/lang/Object; -.implements Liface; - -.method public SayHi()Ljava/lang/String; - .locals 2 - invoke-super {p0}, Liface;->SayHi()Ljava/lang/String; - move-result-object v0 - invoke-super {p0}, Liface;->SayHi()Ljava/lang/String; - move-result-object v1 - invoke-virtual {v0, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; - move-result-object v0 - return-object v0 -.end method diff --git a/test/969-iface-super/smali/iface3.smali b/test/969-iface-super/smali/iface3.smali deleted file mode 100644 index bf200364ec..0000000000 --- a/test/969-iface-super/smali/iface3.smali +++ /dev/null @@ -1,22 +0,0 @@ -# /* -# * Copyright (C) 2015 The Android Open Source Project -# * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# */ -# -# public interface iface3 extends iface { -# } - -.class public abstract interface Liface3; -.super Ljava/lang/Object; -.implements Liface; diff --git a/test/969-iface-super/src/A.java b/test/969-iface-super/src/A.java new file mode 100644 index 0000000000..47db14ba84 --- /dev/null +++ b/test/969-iface-super/src/A.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class A implements Iface { } diff --git a/test/969-iface-super/src/B.java b/test/969-iface-super/src/B.java new file mode 100644 index 0000000000..70f63a237a --- /dev/null +++ b/test/969-iface-super/src/B.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class B implements Iface2 { } diff --git a/test/969-iface-super/src/C.java b/test/969-iface-super/src/C.java new file mode 100644 index 0000000000..0fa0b9280b --- /dev/null +++ b/test/969-iface-super/src/C.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class C implements Iface { + public String SayHi() { + return Iface.super.SayHi() + " and welcome "; + } +} diff --git a/test/969-iface-super/src/D.java b/test/969-iface-super/src/D.java new file mode 100644 index 0000000000..8a607c3adf --- /dev/null +++ b/test/969-iface-super/src/D.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class D implements Iface2 { + public String SayHi() { + return Iface2.super.SayHi() + " and welcome "; + } +} diff --git a/test/969-iface-super/src/E.java b/test/969-iface-super/src/E.java new file mode 100644 index 0000000000..d5942b22b6 --- /dev/null +++ b/test/969-iface-super/src/E.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class E implements Iface3 { + public String SayHi() { + return Iface3.super.SayHi() + " there!"; + } +} diff --git a/test/969-iface-super/src/F.java b/test/969-iface-super/src/F.java new file mode 100644 index 0000000000..610bcb158a --- /dev/null +++ b/test/969-iface-super/src/F.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class F extends E { + public String SaySurprisedHi() { + return super.SayHi() + "!"; + } +} diff --git a/test/969-iface-super/src/G.java b/test/969-iface-super/src/G.java new file mode 100644 index 0000000000..edaf3a9b11 --- /dev/null +++ b/test/969-iface-super/src/G.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class G extends F { + public String SayHi() { + return super.SayHi() + "?"; + } + public String SayVerySurprisedHi() { + return super.SaySurprisedHi() + "!"; + } +} diff --git a/test/969-iface-super/src/H.java b/test/969-iface-super/src/H.java new file mode 100644 index 0000000000..744bda6f82 --- /dev/null +++ b/test/969-iface-super/src/H.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class H extends A { + public String SayHi() { + return super.SayHi() + "?"; + } + public String SaySurprisedHi() { + return super.SayHi() + "!"; + } + public String SayConfusedHi() { + return SayHi() + "!"; + } +} diff --git a/test/969-iface-super/src/Iface.java b/test/969-iface-super/src/Iface.java new file mode 100644 index 0000000000..ece5e592de --- /dev/null +++ b/test/969-iface-super/src/Iface.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface { + public default String SayHi() { + return "Hello "; + } +} diff --git a/test/969-iface-super/src/Iface2.java b/test/969-iface-super/src/Iface2.java new file mode 100644 index 0000000000..d74ee6ddf5 --- /dev/null +++ b/test/969-iface-super/src/Iface2.java @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface2 extends Iface { + public default String SayHi() { + return Iface.super.SayHi() + Iface.super.SayHi(); + } +} diff --git a/test/969-iface-super/src/Iface3.java b/test/969-iface-super/src/Iface3.java new file mode 100644 index 0000000000..10b010cb3b --- /dev/null +++ b/test/969-iface-super/src/Iface3.java @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public interface Iface3 extends Iface { } diff --git a/test/969-iface-super/smali/classes.xml b/test/969-iface-super/src/classes.xml index 4d205bd606..4c3dae4fa0 100644 --- a/test/969-iface-super/smali/classes.xml +++ b/test/969-iface-super/src/classes.xml @@ -18,35 +18,35 @@ <classes> <class name="A" super="java/lang/Object"> <implements> - <item>iface</item> + <item>Iface</item> </implements> <methods> </methods> </class> <class name="B" super="java/lang/Object"> <implements> - <item>iface2</item> + <item>Iface2</item> </implements> <methods> </methods> </class> <class name="C" super="java/lang/Object"> <implements> - <item>iface</item> + <item>Iface</item> </implements> <methods> </methods> </class> <class name="D" super="java/lang/Object"> <implements> - <item>iface2</item> + <item>Iface2</item> </implements> <methods> </methods> </class> <class name="E" super="java/lang/Object"> <implements> - <item>iface3</item> + <item>Iface3</item> </implements> <methods> </methods> </class> @@ -75,23 +75,23 @@ </classes> <interfaces> - <interface name="iface" super="java/lang/Object"> + <interface name="Iface" super="java/lang/Object"> <implements> </implements> <methods> <item>SayHi</item> </methods> </interface> - <interface name="iface2" super="java/lang/Object"> + <interface name="Iface2" super="java/lang/Object"> <implements> - <item>iface</item> + <item>Iface</item> </implements> <methods> </methods> </interface> - <interface name="iface3" super="java/lang/Object"> + <interface name="Iface3" super="java/lang/Object"> <implements> - <item>iface</item> + <item>Iface</item> </implements> <methods> </methods> </interface> diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 67efccd041..e05d4f54c5 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -551,6 +551,7 @@ TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \ $(TEST_ART_BROKEN_INTERPRETER_RUN_TESTS) # Tests that should fail in the read barrier configuration with the Optimizing compiler (AOT). +# 145: Test sometimes times out in read barrier configuration (b/27467554). # 484: Baker's fast path based read barrier compiler instrumentation generates code containing # more parallel moves on x86, thus some Checker assertions may fail. # 527: On ARM64, the read barrier instrumentation does not support the HArm64IntermediateAddress @@ -558,6 +559,7 @@ TEST_ART_BROKEN_DEFAULT_READ_BARRIER_RUN_TESTS := \ # 537: Expects an array copy to be intrinsified on x86-64, but calling-on-slowpath intrinsics are # not yet handled in the read barrier configuration. TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS := \ + 145-alloc-tracking-stress \ 484-checker-register-hints \ 527-checker-array-access-split \ 537-checker-arraycopy diff --git a/test/utils/python/generate_smali_main.py b/test/utils/python/generate_java_main.py index d796d313c6..f66d0dd372 100755 --- a/test/utils/python/generate_smali_main.py +++ b/test/utils/python/generate_java_main.py @@ -15,7 +15,7 @@ # limitations under the License. """ -Generate Smali Main file from a classes.xml file. +Generate Java Main file from a classes.xml file. """ import os @@ -38,48 +38,27 @@ import itertools import functools import xml.etree.ElementTree as ET -class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): +class MainClass(mixins.DumpMixin, mixins.Named, mixins.JavaFileMixin): """ A mainclass and main method for this test. """ MAIN_CLASS_TEMPLATE = """{copyright} -.class public LMain; -.super Ljava/lang/Object; - -# class Main {{ - -.method public constructor <init>()V - .registers 1 - invoke-direct {{p0}}, Ljava/lang/Object;-><init>()V - return-void -.end method - +class Main {{ {test_groups} - {test_funcs} - {main_func} - -# }} +}} """ MAIN_FUNCTION_TEMPLATE = """ -# public static void main(String[] args) {{ -.method public static main([Ljava/lang/String;)V - .locals 2 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; - + public static void main(String[] args) {{ {test_group_invoke} - - return-void -.end method -# }} + }} """ TEST_GROUP_INVOKE_TEMPLATE = """ -# {test_name}(); - invoke-static {{}}, {test_name}()V + {test_name}(); """ def __init__(self): @@ -123,7 +102,7 @@ class MainClass(mixins.DumpMixin, mixins.Named, mixins.SmaliFileMixin): funcs = "" for f in self.global_funcs: funcs += str(f) - return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright('smali'), + return self.MAIN_CLASS_TEMPLATE.format(copyright = get_copyright('java'), test_groups=test_groups, main_func=main_func, test_funcs=funcs) @@ -135,33 +114,19 @@ class InstanceTest(mixins.Named, mixins.NameComparableMixin): """ INSTANCE_TEST_TEMPLATE = """ -# public static void {test_name}() {{ -# System.out.println("Testing for type {ty}"); -# String s = "{ty}"; -# {ty} v = new {ty}(); -.method public static {test_name}()V - .locals 3 - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v0, "Testing for type {ty}" - invoke-virtual {{v2,v0}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - - const-string v0, "{ty}" - new-instance v1, L{ty}; - invoke-direct {{v1}}, L{ty};-><init>()V + public static void {test_name}() {{ + System.out.println("Testing for type {ty}"); + String s = "{ty}"; + {ty} v = new {ty}(); {invokes} - const-string v0, "End testing for type {ty}" - invoke-virtual {{v2,v0}}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - return-void -.end method -# System.out.println("End testing for type {ty}"); -# }} + System.out.println("End testing for type {ty}"); + }} """ TEST_INVOKE_TEMPLATE = """ -# {fname}(s, v); - invoke-static {{v0, v1}}, {fname}(Ljava/lang/String;L{farg};)V + {fname}(s, v); """ def __init__(self, main, ty): @@ -188,7 +153,7 @@ class InstanceTest(mixins.Named, mixins.NameComparableMixin): def __str__(self): """ - Returns the smali code for this function + Returns the java code for this function """ func_invokes = "" for f in sorted(self.funcs, key=lambda a: (a.func, a.farg)): @@ -204,47 +169,15 @@ class Func(mixins.Named, mixins.NameComparableMixin): """ TEST_FUNCTION_TEMPLATE = """ -# public static void {fname}(String s, {farg} v) {{ -# try {{ -# System.out.printf("%s-{invoke_type:<9} {farg:>9}.{callfunc}()='%s'\\n", s, v.{callfunc}()); -# return; -# }} catch (Error e) {{ -# System.out.printf("%s-{invoke_type} on {farg}: {callfunc}() threw exception!\\n", s); -# e.printStackTrace(System.out); -# }} -# }} -.method public static {fname}(Ljava/lang/String;L{farg};)V - .locals 7 - :call_{fname}_try_start - const/4 v0, 2 - new-array v1,v0, [Ljava/lang/Object; - const/4 v0, 0 - aput-object p0,v1,v0 - - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v3, "%s-{invoke_type:<9} {farg:>9}.{callfunc}()='%s'\\n" - - invoke-{invoke_type} {{p1}}, L{farg};->{callfunc}()Ljava/lang/String; - move-result-object v4 - const/4 v0, 1 - aput-object v4, v1, v0 - - invoke-virtual {{v2,v3,v1}}, Ljava/io/PrintStream;->printf(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream; - return-void - :call_{fname}_try_end - .catch Ljava/lang/Error; {{:call_{fname}_try_start .. :call_{fname}_try_end}} :error_{fname}_start - :error_{fname}_start - move-exception v3 - const/4 v0, 1 - new-array v1,v0, [Ljava/lang/Object; - const/4 v0, 0 - aput-object p0, v1, v0 - sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - const-string v4, "%s-{invoke_type} on {farg}: {callfunc}() threw exception!\\n" - invoke-virtual {{v2,v4,v1}}, Ljava/io/PrintStream;->printf(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream; - invoke-virtual {{v3,v2}}, Ljava/lang/Error;->printStackTrace(Ljava/io/PrintStream;)V - return-void -.end method + public static void {fname}(String s, {farg} v) {{ + try {{ + System.out.printf("%s-{invoke_type:<9} {farg:>9}.{callfunc}()='%s'\\n", s, v.{callfunc}()); + return; + }} catch (Error e) {{ + System.out.printf("%s-{invoke_type} on {farg}: {callfunc}() threw exception!\\n", s); + e.printStackTrace(System.out); + }} + }} """ def __init__(self, func, farg, invoke): @@ -263,7 +196,7 @@ class Func(mixins.Named, mixins.NameComparableMixin): def __str__(self): """ - Get the smali code for this test function + Get the java code for this test function """ return self.TEST_FUNCTION_TEMPLATE.format(fname=self.get_name(), farg=self.farg, @@ -307,7 +240,7 @@ def flatten_interface_methods(dat, i): def make_main_class(dat): """ - Creates a Main.smali file that runs all the tests + Creates a Main.java file that runs all the tests """ m = MainClass() for c in dat.classes.values(): @@ -365,12 +298,12 @@ def parse_xml(xml): return TestData(classes, ifaces) def main(argv): - smali_dir = Path(argv[1]) - if not smali_dir.exists() or not smali_dir.is_dir(): - print("{} is not a valid smali dir".format(smali_dir), file=sys.stderr) + java_dir = Path(argv[1]) + if not java_dir.exists() or not java_dir.is_dir(): + print("{} is not a valid java dir".format(java_dir), file=sys.stderr) sys.exit(1) - class_data = parse_xml((smali_dir / "classes.xml").open().read()) - make_main_class(class_data).dump(smali_dir) + class_data = parse_xml((java_dir / "classes.xml").open().read()) + make_main_class(class_data).dump(java_dir) if __name__ == '__main__': main(sys.argv) diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index e4af9fa0d7..8422e20823 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -51,7 +51,7 @@ vm_command="--vm-command=$art" image_compiler_option="" debug="no" verbose="no" -image="-Ximage:/data/art-test/core-jit.art" +image="-Ximage:/data/art-test/core-optimizing-pic.art" vm_args="" # By default, we run the whole JDWP test suite. test="org.apache.harmony.jpda.tests.share.AllTests" @@ -70,9 +70,6 @@ while true; do device_dir="" # Vogar knows which VM to use on host. vm_command="" - # We only compile the image on the host. Note that not providing this option - # for target testing puts us below the adb command limit for vogar. - image_compiler_option="--vm-arg -Ximage-compiler-option --vm-arg --debuggable" shift elif [[ $1 == -Ximage:* ]]; then image="$1" |