1 files changed, 9 insertions, 0 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 040c2449a7..325fb87fc5 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -743,6 +743,10 @@ static bool CanAssembleGraphForRiscv64(HGraph* graph) {
           UNREACHABLE();
         case HInstruction::kExit:
         case HInstruction::kGoto:
+        case HInstruction::kPackedSwitch:
+        case HInstruction::kTryBoundary:
+        case HInstruction::kClearException:
+        case HInstruction::kLoadException:
         case HInstruction::kParameterValue:
         case HInstruction::kReturn:
         case HInstruction::kReturnVoid:
@@ -757,8 +761,13 @@ static bool CanAssembleGraphForRiscv64(HGraph* graph) {
         case HInstruction::kLoadMethodHandle:
         case HInstruction::kLoadMethodType:
         case HInstruction::kInstanceFieldGet:
+        case HInstruction::kInstanceFieldSet:
         case HInstruction::kStaticFieldGet:
+        case HInstruction::kStaticFieldSet:
         case HInstruction::kArrayGet:
+        case HInstruction::kArrayLength:
+        case HInstruction::kArraySet:
+        case HInstruction::kBoundsCheck:
         case HInstruction::kAbove:
         case HInstruction::kAboveOrEqual:
         case HInstruction::kBelow: