Use hasFeature and include Zca in 2-byte alignment

mtvec · mtvec · commit ee5408d97a8a · 2023-10-23T08:41:47.000+02:00
diff --git a/bolt/lib/Target/RISCV/RISCVMCPlusBuilder.cpp b/bolt/lib/Target/RISCV/RISCVMCPlusBuilder.cpp
@@ -493,7 +493,10 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
   }
 
   uint16_t getMinFunctionAlignment() const override {
-    return STI->getFeatureBits()[RISCV::FeatureStdExtC] ? 2 : 4;
+    if (STI->hasFeature(RISCV::FeatureStdExtC) ||
+        STI->hasFeature(RISCV::FeatureStdExtZca))
+      return 2;
+    return 4;
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,10 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`uint16_t getMinFunctionAlignment() const override {`
`496`		`- return STI->getFeatureBits()[RISCV::FeatureStdExtC] ? 2 : 4;`
	`496`	`+ if (STI->hasFeature(RISCV::FeatureStdExtC) \|\|`
	`497`	`+ STI->hasFeature(RISCV::FeatureStdExtZca))`
	`498`	`+ return 2;`
	`499`	`+ return 4;`
`497`	`500`	`}`
`498`	`501`	`};`
`499`	`502`