summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Aboy Solanes <solanes@google.com> 2024-03-08 15:48:44 +0000
committer Santiago Aboy Solanes <solanes@google.com> 2024-03-12 15:52:28 +0000
commit5937cdeeef4639e523ae3cfde3bfce3ccb252921 (patch)
tree8c87fc2983ee01ae68fa79be1afb6cd3886d3053
parent68f3ec8001c46f00f82043d7100c04dee4449c48 (diff)
Remove default cases when all cases are defined
Bug: 328756212 Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b Test: m test-art-host-gtest Change-Id: I9584e1b93e49265b84a9e45c8b283ebaf8ad3eb2
-rw-r--r--cmdline/cmdline_result.h2
-rw-r--r--compiler/optimizing/common_arm64.h2
-rw-r--r--compiler/optimizing/graph_visualizer.cc3
-rw-r--r--compiler/optimizing/inliner.cc3
-rw-r--r--compiler/optimizing/nodes.cc9
-rw-r--r--compiler/optimizing/superblock_cloner.cc3
-rw-r--r--compiler/utils/arm/assembler_arm_vixl.cc12
-rw-r--r--compiler/utils/arm/jni_macro_assembler_arm_vixl.cc6
-rw-r--r--compiler/utils/arm64/jni_macro_assembler_arm64.cc6
-rw-r--r--compiler/utils/riscv64/assembler_riscv64_test.cc15
-rw-r--r--compiler/utils/riscv64/jni_macro_assembler_riscv64.cc6
-rw-r--r--compiler/utils/x86/jni_macro_assembler_x86.cc3
-rw-r--r--compiler/utils/x86_64/jni_macro_assembler_x86_64.cc3
-rw-r--r--imgdiag/imgdiag.cc1
-rw-r--r--libelffile/stream/output_stream.cc1
-rw-r--r--runtime/gc/allocator/rosalloc.cc13
-rw-r--r--runtime/gc/allocator/rosalloc.h3
-rw-r--r--runtime/gc/collector/mark_compact.cc3
-rw-r--r--runtime/gc/collector/mark_sweep.cc3
-rw-r--r--runtime/jni/check_jni.cc8
-rw-r--r--runtime/oat/oat.cc2
-rw-r--r--runtime/transaction.cc3
-rw-r--r--test/906-iterate-heap/iterate_heap.cc3
-rw-r--r--test/913-heaps/heaps.cc3
-rw-r--r--tools/signal_dumper/signal_dumper.cc4
25 files changed, 0 insertions, 120 deletions
diff --git a/cmdline/cmdline_result.h b/cmdline/cmdline_result.h
index 0ae1145a52..a21e3b4559 100644
--- a/cmdline/cmdline_result.h
+++ b/cmdline/cmdline_result.h
@@ -92,8 +92,6 @@ static inline std::ostream& operator<<(std::ostream& stream, CmdlineResult::Stat
case CmdlineResult::kUnknown:
stream << "kUnknown";
break;
- default:
- UNREACHABLE();
}
return stream;
}
diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h
index e2ef8d52f2..8b64b2e2e8 100644
--- a/compiler/optimizing/common_arm64.h
+++ b/compiler/optimizing/common_arm64.h
@@ -349,7 +349,6 @@ inline vixl::aarch64::Shift ShiftFromOpKind(HDataProcWithShifterOp::OpKind op_ki
default:
LOG(FATAL) << "Unexpected op kind " << op_kind;
UNREACHABLE();
- return vixl::aarch64::NO_SHIFT;
}
}
@@ -364,7 +363,6 @@ inline vixl::aarch64::Extend ExtendFromOpKind(HDataProcWithShifterOp::OpKind op_
default:
LOG(FATAL) << "Unexpected op kind " << op_kind;
UNREACHABLE();
- return vixl::aarch64::NO_EXTEND;
}
}
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 6696c1ef17..1e4f71f9a2 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -109,9 +109,6 @@ std::ostream& operator<<(std::ostream& os, const StringList& list) {
switch (list.format_) {
case StringList::kArrayBrackets: return os << "[" << list.sstream_.str() << "]";
case StringList::kSetBrackets: return os << "{" << list.sstream_.str() << "}";
- default:
- LOG(FATAL) << "Invalid StringList format";
- UNREACHABLE();
}
}
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 5917f8447e..0fd3eeab2e 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1807,9 +1807,6 @@ bool HInliner::TryPatternSubstitution(HInvoke* invoke_instruction,
number_of_instructions = number_of_iputs + (needs_constructor_barrier ? 1u : 0u);
break;
}
- default:
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
}
if (number_of_instructions != 0u) {
total_number_of_instructions_ += number_of_instructions;
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index c87c78815b..ba268560e8 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -1885,9 +1885,6 @@ std::ostream& operator<<(std::ostream& os, ComparisonBias rhs) {
return os << "gt";
case ComparisonBias::kLtBias:
return os << "lt";
- default:
- LOG(FATAL) << "Unknown ComparisonBias: " << static_cast<int>(rhs);
- UNREACHABLE();
}
}
@@ -3244,9 +3241,6 @@ std::ostream& operator<<(std::ostream& os, HInvokeStaticOrDirect::ClinitCheckReq
return os << "implicit";
case HInvokeStaticOrDirect::ClinitCheckRequirement::kNone:
return os << "none";
- default:
- LOG(FATAL) << "Unknown ClinitCheckRequirement: " << static_cast<int>(rhs);
- UNREACHABLE();
}
}
@@ -3426,9 +3420,6 @@ std::ostream& operator<<(std::ostream& os, TypeCheckKind rhs) {
return os << "array_check";
case TypeCheckKind::kBitstringCheck:
return os << "bitstring_check";
- default:
- LOG(FATAL) << "Unknown TypeCheckKind: " << static_cast<int>(rhs);
- UNREACHABLE();
}
}
diff --git a/compiler/optimizing/superblock_cloner.cc b/compiler/optimizing/superblock_cloner.cc
index 7c0097c6f6..0a7b95a1fb 100644
--- a/compiler/optimizing/superblock_cloner.cc
+++ b/compiler/optimizing/superblock_cloner.cc
@@ -1171,9 +1171,6 @@ HBasicBlock* LoopClonerHelper::DoLoopTransformationImpl(TransformationKind trans
case TransformationKind::kVersioning:
oss << "versioning";
break;
- default:
- LOG(FATAL) << "Unreachable";
- UNREACHABLE();
}
oss << " was applied to the loop <" << loop_header->GetBlockId() << ">.";
LOG(INFO) << oss.str();
diff --git a/compiler/utils/arm/assembler_arm_vixl.cc b/compiler/utils/arm/assembler_arm_vixl.cc
index d64de09501..2dbd6739ef 100644
--- a/compiler/utils/arm/assembler_arm_vixl.cc
+++ b/compiler/utils/arm/assembler_arm_vixl.cc
@@ -173,9 +173,6 @@ int32_t ArmVIXLAssembler::GetAllowedLoadOffsetBits(LoadOperandType type) {
case kLoadWordPair:
// We can encode imm8:'00' offset.
return 0xff << 2;
- default:
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
}
}
@@ -192,9 +189,6 @@ int32_t ArmVIXLAssembler::GetAllowedStoreOffsetBits(StoreOperandType type) {
case kStoreWordPair:
// We can encode imm8:'00' offset.
return 0xff << 2;
- default:
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
}
}
@@ -212,9 +206,6 @@ static bool CanHoldLoadOffsetThumb(LoadOperandType type, int offset) {
return IsAbsoluteUint<10>(offset) && IsAligned<4>(offset); // VFP addressing mode.
case kLoadWordPair:
return IsAbsoluteUint<10>(offset) && IsAligned<4>(offset);
- default:
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
}
}
@@ -230,9 +221,6 @@ static bool CanHoldStoreOffsetThumb(StoreOperandType type, int offset) {
return IsAbsoluteUint<10>(offset) && IsAligned<4>(offset); // VFP addressing mode.
case kStoreWordPair:
return IsAbsoluteUint<10>(offset) && IsAligned<4>(offset);
- default:
- LOG(FATAL) << "UNREACHABLE";
- UNREACHABLE();
}
}
diff --git a/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc b/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
index 6844b1e656..3799c2add0 100644
--- a/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
+++ b/compiler/utils/arm/jni_macro_assembler_arm_vixl.cc
@@ -1035,9 +1035,6 @@ void ArmVIXLJNIMacroAssembler::TestGcMarking(JNIMacroLabel* label, JNIMacroUnary
case JNIMacroUnaryCondition::kNotZero:
___ CompareAndBranchIfNonZero(test_reg, ArmVIXLJNIMacroLabel::Cast(label)->AsArm());
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
@@ -1058,9 +1055,6 @@ void ArmVIXLJNIMacroAssembler::TestMarkBit(ManagedRegister mref,
case JNIMacroUnaryCondition::kNotZero:
___ B(ne, ArmVIXLJNIMacroLabel::Cast(label)->AsArm());
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
diff --git a/compiler/utils/arm64/jni_macro_assembler_arm64.cc b/compiler/utils/arm64/jni_macro_assembler_arm64.cc
index 50f6b4158d..691608292d 100644
--- a/compiler/utils/arm64/jni_macro_assembler_arm64.cc
+++ b/compiler/utils/arm64/jni_macro_assembler_arm64.cc
@@ -832,9 +832,6 @@ void Arm64JNIMacroAssembler::TestGcMarking(JNIMacroLabel* label, JNIMacroUnaryCo
case JNIMacroUnaryCondition::kNotZero:
___ Cbnz(test_reg, Arm64JNIMacroLabel::Cast(label)->AsArm64());
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
@@ -854,9 +851,6 @@ void Arm64JNIMacroAssembler::TestMarkBit(ManagedRegister m_ref,
case JNIMacroUnaryCondition::kNotZero:
___ Tbnz(scratch, LockWord::kMarkBitStateShift, Arm64JNIMacroLabel::Cast(label)->AsArm64());
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
diff --git a/compiler/utils/riscv64/assembler_riscv64_test.cc b/compiler/utils/riscv64/assembler_riscv64_test.cc
index 2db8c842cd..0f0ce9c789 100644
--- a/compiler/utils/riscv64/assembler_riscv64_test.cc
+++ b/compiler/utils/riscv64/assembler_riscv64_test.cc
@@ -2070,9 +2070,6 @@ class AssemblerRISCV64Test : public AssemblerTest<Riscv64Assembler,
case FPRoundingMode::kDYN:
replacement = "dyn";
break;
- default:
- LOG(FATAL) << "Unexpected value for rm: " << enum_cast<uint32_t>(rm);
- UNREACHABLE();
}
size_t rm_index = str->find(RM_TOKEN);
EXPECT_NE(rm_index, std::string::npos);
@@ -2096,9 +2093,6 @@ class AssemblerRISCV64Test : public AssemblerTest<Riscv64Assembler,
case AqRl::kAqRl:
replacement = ".aqrl";
break;
- default:
- LOG(FATAL) << "Unexpected value for `aqrl`: " << enum_cast<uint32_t>(aqrl);
- UNREACHABLE();
}
size_t aqrl_index = str->find(AQRL_TOKEN);
EXPECT_NE(aqrl_index, std::string::npos);
@@ -2116,9 +2110,6 @@ class AssemblerRISCV64Test : public AssemblerTest<Riscv64Assembler,
case Riscv64Assembler::VM::kV0_t:
replacement = ", v0.t";
break;
- default:
- LOG(FATAL) << "Unexpected value for `VM`: " << enum_cast<uint32_t>(vm);
- UNREACHABLE();
}
size_t vm_index = str->find(VM_TOKEN);
EXPECT_NE(vm_index, std::string::npos);
@@ -2136,9 +2127,6 @@ class AssemblerRISCV64Test : public AssemblerTest<Riscv64Assembler,
case Riscv64Assembler::VectorMaskAgnostic::kUndisturbed:
replacement = "mu";
break;
- default:
- LOG(FATAL) << "Unexpected value for `VectorMaskAgnostic`: " << enum_cast<uint32_t>(vma);
- UNREACHABLE();
}
size_t vma_index = str->find(VMA_TOKEN);
EXPECT_NE(vma_index, std::string::npos);
@@ -2156,9 +2144,6 @@ class AssemblerRISCV64Test : public AssemblerTest<Riscv64Assembler,
case Riscv64Assembler::VectorTailAgnostic::kUndisturbed:
replacement = "tu";
break;
- default:
- LOG(FATAL) << "Unexpected value for `VectorTailAgnostic`: " << enum_cast<uint32_t>(vta);
- UNREACHABLE();
}
size_t vta_index = str->find(VTA_TOKEN);
EXPECT_NE(vta_index, std::string::npos);
diff --git a/compiler/utils/riscv64/jni_macro_assembler_riscv64.cc b/compiler/utils/riscv64/jni_macro_assembler_riscv64.cc
index e2ef9c4b7f..c0e6395dfe 100644
--- a/compiler/utils/riscv64/jni_macro_assembler_riscv64.cc
+++ b/compiler/utils/riscv64/jni_macro_assembler_riscv64.cc
@@ -578,9 +578,6 @@ void Riscv64JNIMacroAssembler::TestGcMarking(JNIMacroLabel* label, JNIMacroUnary
case JNIMacroUnaryCondition::kNotZero:
__ Bnez(test_reg, down_cast<Riscv64Label*>(Riscv64JNIMacroLabel::Cast(label)->AsRiscv64()));
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
@@ -602,9 +599,6 @@ void Riscv64JNIMacroAssembler::TestMarkBit(ManagedRegister m_ref,
case JNIMacroUnaryCondition::kNotZero:
__ Bltz(tmp, Riscv64JNIMacroLabel::Cast(label)->AsRiscv64());
break;
- default:
- LOG(FATAL) << "Not implemented unary condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
diff --git a/compiler/utils/x86/jni_macro_assembler_x86.cc b/compiler/utils/x86/jni_macro_assembler_x86.cc
index 3ee0530dc2..da572fc72c 100644
--- a/compiler/utils/x86/jni_macro_assembler_x86.cc
+++ b/compiler/utils/x86/jni_macro_assembler_x86.cc
@@ -556,9 +556,6 @@ static Condition UnaryConditionToX86Condition(JNIMacroUnaryCondition cond) {
return kZero;
case JNIMacroUnaryCondition::kNotZero:
return kNotZero;
- default:
- LOG(FATAL) << "Not implemented condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
diff --git a/compiler/utils/x86_64/jni_macro_assembler_x86_64.cc b/compiler/utils/x86_64/jni_macro_assembler_x86_64.cc
index 1b9cfa640e..be146f701a 100644
--- a/compiler/utils/x86_64/jni_macro_assembler_x86_64.cc
+++ b/compiler/utils/x86_64/jni_macro_assembler_x86_64.cc
@@ -624,9 +624,6 @@ static Condition UnaryConditionToX86_64Condition(JNIMacroUnaryCondition cond) {
return kZero;
case JNIMacroUnaryCondition::kNotZero:
return kNotZero;
- default:
- LOG(FATAL) << "Not implemented condition: " << static_cast<int>(cond);
- UNREACHABLE();
}
}
diff --git a/imgdiag/imgdiag.cc b/imgdiag/imgdiag.cc
index adadfcf330..66eac8c912 100644
--- a/imgdiag/imgdiag.cc
+++ b/imgdiag/imgdiag.cc
@@ -76,7 +76,6 @@ std::ostream& operator<<(std::ostream& os, RemoteProcesses remotes) {
case RemoteProcesses::kImageOnly: os << "ImageOnly"; break;
case RemoteProcesses::kZygoteOnly: os << "ZygoteOnly"; break;
case RemoteProcesses::kImageAndZygote: os << "ImageAndZygote"; break;
- default: UNREACHABLE();
}
return os;
}
diff --git a/libelffile/stream/output_stream.cc b/libelffile/stream/output_stream.cc
index a8b64ca1ce..fc2a04c208 100644
--- a/libelffile/stream/output_stream.cc
+++ b/libelffile/stream/output_stream.cc
@@ -23,7 +23,6 @@ std::ostream& operator<<(std::ostream& os, const Whence& rhs) {
case kSeekSet: os << "SEEK_SET"; break;
case kSeekCurrent: os << "SEEK_CUR"; break;
case kSeekEnd: os << "SEEK_END"; break;
- default: UNREACHABLE();
}
return os;
}
diff --git a/runtime/gc/allocator/rosalloc.cc b/runtime/gc/allocator/rosalloc.cc
index 03f52eeaa9..5445e78e90 100644
--- a/runtime/gc/allocator/rosalloc.cc
+++ b/runtime/gc/allocator/rosalloc.cc
@@ -531,9 +531,6 @@ size_t RosAlloc::FreeInternal(Thread* self, void* ptr) {
LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(page_map_[pm_idx]);
UNREACHABLE();
}
- default:
- LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(page_map_[pm_idx]);
- UNREACHABLE();
}
}
DCHECK(run != nullptr);
@@ -1476,9 +1473,6 @@ void RosAlloc::InspectAll(void (*handler)(void* start, void* end, size_t used_by
case kPageMapRunPart:
LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(pm);
UNREACHABLE();
- default:
- LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(pm);
- UNREACHABLE();
}
}
}
@@ -1837,8 +1831,6 @@ void RosAlloc::Verify() {
break;
}
case kPageMapRunPart:
- // Fall-through.
- default:
LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(pm) << std::endl << DumpPageMap();
UNREACHABLE();
}
@@ -2031,9 +2023,6 @@ size_t RosAlloc::ReleasePages() {
case kPageMapRunPart: // Fall through.
++i;
break; // Skip.
- default:
- LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(pm);
- UNREACHABLE();
}
}
return reclaimed_bytes;
@@ -2158,8 +2147,6 @@ void RosAlloc::DumpStats(std::ostream& os) {
break;
}
case kPageMapRunPart:
- // Fall-through.
- default:
LOG(FATAL) << "Unreachable - page map type: " << static_cast<int>(pm) << std::endl
<< DumpPageMap();
UNREACHABLE();
diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h
index 333f80ff92..6dd3fda0e3 100644
--- a/runtime/gc/allocator/rosalloc.h
+++ b/runtime/gc/allocator/rosalloc.h
@@ -95,9 +95,6 @@ class RosAlloc {
return IsLargerThanPageReleaseThreshold(rosalloc) && IsAtEndOfSpace(rosalloc);
case kPageReleaseModeAll:
return true;
- default:
- LOG(FATAL) << "Unexpected page release mode ";
- return false;
}
}
void ReleasePages(RosAlloc* rosalloc) REQUIRES(rosalloc->lock_) {
diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc
index 08404619b3..0cea34e7bb 100644
--- a/runtime/gc/collector/mark_compact.cc
+++ b/runtime/gc/collector/mark_compact.cc
@@ -4070,9 +4070,6 @@ void MarkCompact::ScanDirtyObjects(bool paused, uint8_t minimum_age) {
case space::kGcRetentionPolicyAlwaysCollect:
name = paused ? "(Paused)ScanGrayAllocSpaceObjects" : "ScanGrayAllocSpaceObjects";
break;
- default:
- LOG(FATAL) << "Unreachable";
- UNREACHABLE();
}
TimingLogger::ScopedTiming t(name, GetTimings());
card_table->Scan</*kClearCard*/ false>(
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index 984d71ca25..7c22247759 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -966,9 +966,6 @@ void MarkSweep::ScanGrayObjects(bool paused, uint8_t minimum_age) {
case space::kGcRetentionPolicyAlwaysCollect:
name = paused ? "(Paused)ScanGrayAllocSpaceObjects" : "ScanGrayAllocSpaceObjects";
break;
- default:
- LOG(FATAL) << "Unreachable";
- UNREACHABLE();
}
TimingLogger::ScopedTiming t(name, GetTimings());
ScanObjectVisitor visitor(this);
diff --git a/runtime/jni/check_jni.cc b/runtime/jni/check_jni.cc
index db4205cdf8..a05a3e97f2 100644
--- a/runtime/jni/check_jni.cc
+++ b/runtime/jni/check_jni.cc
@@ -853,8 +853,6 @@ class ScopedCheck {
case kThrowable:
what = "jthrowable";
break;
- default:
- LOG(FATAL) << "Unknown kind " << static_cast<int>(kind);
}
if (java_object == nullptr) {
@@ -3303,9 +3301,6 @@ class CheckJNI {
LOG(FATAL) << "Unexpected invoke: " << invoke;
}
break;
- default:
- LOG(FATAL) << "Unexpected return type: " << type;
- result_check = nullptr;
}
if (sc.Check(soa, false, result_check, &result)) {
return result;
@@ -3489,9 +3484,6 @@ class CheckJNI {
LOG(FATAL) << "Unexpected invoke: " << invoke;
}
break;
- default:
- LOG(FATAL) << "Unexpected return type: " << type;
- result_check = nullptr;
}
if (sc.Check(soa, false, result_check, &result)) {
return result;
diff --git a/runtime/oat/oat.cc b/runtime/oat/oat.cc
index 9cec2e9869..0cb22065b0 100644
--- a/runtime/oat/oat.cc
+++ b/runtime/oat/oat.cc
@@ -485,8 +485,6 @@ const uint8_t* OatHeader::GetOatAddress(StubType type) const {
return static_cast<const uint8_t*>(GetQuickToInterpreterBridge());
case StubType::kNterpTrampoline:
return static_cast<const uint8_t*>(GetNterpTrampoline());
- default:
- UNREACHABLE();
}
}
diff --git a/runtime/transaction.cc b/runtime/transaction.cc
index bc6651633d..e3a013514d 100644
--- a/runtime/transaction.cc
+++ b/runtime/transaction.cc
@@ -582,9 +582,6 @@ void Transaction::ObjectLog::UndoFieldWrite(mirror::Object* obj,
reinterpret_cast<mirror::Object*>(field_value.value));
}
break;
- default:
- LOG(FATAL) << "Unknown value kind " << static_cast<int>(field_value.kind);
- UNREACHABLE();
}
}
diff --git a/test/906-iterate-heap/iterate_heap.cc b/test/906-iterate-heap/iterate_heap.cc
index b226eb03b6..cd4b46a008 100644
--- a/test/906-iterate-heap/iterate_heap.cc
+++ b/test/906-iterate-heap/iterate_heap.cc
@@ -284,9 +284,6 @@ extern "C" JNIEXPORT jstring JNICALL Java_art_Test906_iterateThroughHeapPrimitiv
case JVMTI_PRIMITIVE_TYPE_DOUBLE:
element_size = 8;
break;
- default:
- LOG(FATAL) << "Unknown type " << static_cast<size_t>(element_type);
- UNREACHABLE();
}
const uint8_t* data = reinterpret_cast<const uint8_t*>(elements);
for (size_t i = 0; i != element_size * element_count; ++i) {
diff --git a/test/913-heaps/heaps.cc b/test/913-heaps/heaps.cc
index e4c3223aaa..197230f01e 100644
--- a/test/913-heaps/heaps.cc
+++ b/test/913-heaps/heaps.cc
@@ -689,9 +689,6 @@ extern "C" JNIEXPORT jstring JNICALL Java_art_Test913_followReferencesPrimitiveA
case JVMTI_PRIMITIVE_TYPE_DOUBLE:
element_size = 8;
break;
- default:
- LOG(FATAL) << "Unknown type " << static_cast<size_t>(element_type);
- UNREACHABLE();
}
const uint8_t* data = reinterpret_cast<const uint8_t*>(elements);
for (size_t i = 0; i != element_size * element_count; ++i) {
diff --git a/tools/signal_dumper/signal_dumper.cc b/tools/signal_dumper/signal_dumper.cc
index ebbe6ad674..019b9897e8 100644
--- a/tools/signal_dumper/signal_dumper.cc
+++ b/tools/signal_dumper/signal_dumper.cc
@@ -403,8 +403,6 @@ void DumpABI(pid_t forked_pid) {
case ABI::kX86_64:
to_print = ABI::kX86_64;
break;
- default:
- __builtin_unreachable();
}
} else {
// Check the length of the data. Assume that it's the same arch as the tool.
@@ -420,8 +418,6 @@ void DumpABI(pid_t forked_pid) {
case ABI::kX86_64:
to_print = io_vec.iov_len == 17 * sizeof(uint32_t) ? ABI::kX86 : ABI::kX86_64;
break;
- default:
- __builtin_unreachable();
}
}
std::string abi_str;