diff options
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 5 | ||||
| -rw-r--r-- | compiler/optimizing/instruction_builder.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.cc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 45322e7e27..90df4521e8 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -1346,8 +1346,7 @@ bool HInliner::TryDevirtualize(HInvoke* invoke_instruction, // Don't devirtualize to an intrinsic invalid after the builder phase. The ArtMethod might be an // intrinsic even when the HInvoke isn't e.g. java.lang.CharSequence.isEmpty (not an intrinsic) // can get devirtualized into java.lang.String.isEmpty (which is an intrinsic). - if (method->IsIntrinsic() && - !IsValidIntrinsicAfterBuilder(static_cast<Intrinsics>(method->GetIntrinsic()))) { + if (method->IsIntrinsic() && !IsValidIntrinsicAfterBuilder(method->GetIntrinsic())) { return false; } @@ -1598,7 +1597,7 @@ bool HInliner::TryBuildAndInline(HInvoke* invoke_instruction, // another chance before we try to inline it. if (invoke_instruction->GetResolvedMethod() != method && method->IsIntrinsic() && - IsValidIntrinsicAfterBuilder(static_cast<Intrinsics>(method->GetIntrinsic()))) { + IsValidIntrinsicAfterBuilder(method->GetIntrinsic())) { MaybeRecordStat(stats_, MethodCompilationStat::kIntrinsicRecognized); // For simplicity, always create a new instruction to replace the existing // invoke. diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 356322e85b..f3676bbc02 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -1944,7 +1944,7 @@ bool HInstructionBuilder::BuildSimpleIntrinsic(ArtMethod* method, uint32_t dex_pc, const InstructionOperands& operands, const char* shorty) { - Intrinsics intrinsic = static_cast<Intrinsics>(method->GetIntrinsic()); + Intrinsics intrinsic = method->GetIntrinsic(); DCHECK_NE(intrinsic, Intrinsics::kNone); constexpr DataType::Type kInt32 = DataType::Type::kInt32; constexpr DataType::Type kInt64 = DataType::Type::kInt64; diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index a45d250307..588f4d7ce2 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -3450,7 +3450,7 @@ static inline IntrinsicExceptions GetExceptionsIntrinsic(Intrinsics i) { void HInvoke::SetResolvedMethod(ArtMethod* method, bool enable_intrinsic_opt) { if (method != nullptr && method->IsIntrinsic() && enable_intrinsic_opt) { - Intrinsics intrinsic = static_cast<Intrinsics>(method->GetIntrinsic()); + Intrinsics intrinsic = method->GetIntrinsic(); SetIntrinsic(intrinsic, NeedsEnvironmentIntrinsic(intrinsic), GetSideEffectsIntrinsic(intrinsic), |