1 files changed, 26 insertions, 11 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 682c2418f8..0fea53c247 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -461,6 +461,18 @@ bool OptimizingCompiler::RunBaselineOptimizations(HGraph* graph,
                               arm_optimizations);
     }
 #endif
+#if defined(ART_ENABLE_CODEGEN_riscv64)
+    case InstructionSet::kRiscv64: {
+      OptimizationDef riscv64_optimizations[] = {
+          OptDef(OptimizationPass::kCriticalNativeAbiFixupRiscv64),
+      };
+      return RunOptimizations(graph,
+                              codegen,
+                              dex_compilation_unit,
+                              pass_observer,
+                              riscv64_optimizations);
+    }
+#endif
 #ifdef ART_ENABLE_CODEGEN_x86
     case InstructionSet::kX86: {
       OptimizationDef x86_optimizations[] = {
@@ -519,6 +531,18 @@ bool OptimizingCompiler::RunArchOptimizations(HGraph* graph,
                               arm64_optimizations);
     }
 #endif
+#if defined(ART_ENABLE_CODEGEN_riscv64)
+    case InstructionSet::kRiscv64: {
+      OptimizationDef riscv64_optimizations[] = {
+          OptDef(OptimizationPass::kCriticalNativeAbiFixupRiscv64)
+      };
+      return RunOptimizations(graph,
+                              codegen,
+                              dex_compilation_unit,
+                              pass_observer,
+                              riscv64_optimizations);
+    }
+#endif
 #ifdef ART_ENABLE_CODEGEN_x86
     case InstructionSet::kX86: {
       OptimizationDef x86_optimizations[] = {
@@ -759,6 +783,7 @@ static bool CanAssembleGraphForRiscv64(HGraph* graph) {
         case HInstruction::kLongConstant:
         case HInstruction::kNullConstant:
         case HInstruction::kLoadClass:
+        case HInstruction::kClinitCheck:
         case HInstruction::kLoadString:
         case HInstruction::kLoadMethodHandle:
         case HInstruction::kLoadMethodType:
@@ -800,22 +825,12 @@ static bool CanAssembleGraphForRiscv64(HGraph* graph) {
         case HInstruction::kNot:
         case HInstruction::kMin:
         case HInstruction::kMax:
+        case HInstruction::kInvokeStaticOrDirect:
         case HInstruction::kInvokeVirtual:
         case HInstruction::kInvokeInterface:
         case HInstruction::kCurrentMethod:
         case HInstruction::kNullCheck:
           break;
-        case HInstruction::kInvokeStaticOrDirect:
-          if (it.Current()->AsInvokeStaticOrDirect()->GetCodePtrLocation() ==
-                  CodePtrLocation::kCallCriticalNative &&
-              it.Current()->AsInvokeStaticOrDirect()->GetNumberOfArguments() >= 8u) {
-            // TODO(riscv64): If there are more than 8 FP args, some may be passed in GPRs
-            // and this requires a `CriticalNativeAbiFixupRiscv64` pass similar to the one
-            // we have for ARM. This is not yet implemented. For simplicity, we reject all
-            // direct @CriticalNative calls with more than 8 args.
-            return false;
-          }
-          break;
         default:
           // Unimplemented instruction.
           return false;