Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a911c8c

Browse files
committedFeb 13, 2024
Use MCSubtargetInfo::getAllProcessorFeatures()
This method is now available in upstream LLVM \o/
1 parent 85eaadf commit a911c8c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,10 @@ extern "C" void LLVMRustPrintTargetCPUs(LLVMTargetMachineRef TM,
368368
}
369369

370370
extern "C" size_t LLVMRustGetTargetFeaturesCount(LLVMTargetMachineRef TM) {
371-
#ifdef LLVM_RUSTLLVM
371+
#if LLVM_VERSION_GE(18, 0)
372372
const TargetMachine *Target = unwrap(TM);
373373
const MCSubtargetInfo *MCInfo = Target->getMCSubtargetInfo();
374-
const ArrayRef<SubtargetFeatureKV> FeatTable = MCInfo->getFeatureTable();
374+
const ArrayRef<SubtargetFeatureKV> FeatTable = MCInfo->getAllProcessorFeatures();
375375
return FeatTable.size();
376376
#else
377377
return 0;
@@ -380,10 +380,10 @@ extern "C" size_t LLVMRustGetTargetFeaturesCount(LLVMTargetMachineRef TM) {
380380

381381
extern "C" void LLVMRustGetTargetFeature(LLVMTargetMachineRef TM, size_t Index,
382382
const char** Feature, const char** Desc) {
383-
#ifdef LLVM_RUSTLLVM
383+
#if LLVM_VERSION_GE(18, 0)
384384
const TargetMachine *Target = unwrap(TM);
385385
const MCSubtargetInfo *MCInfo = Target->getMCSubtargetInfo();
386-
const ArrayRef<SubtargetFeatureKV> FeatTable = MCInfo->getFeatureTable();
386+
const ArrayRef<SubtargetFeatureKV> FeatTable = MCInfo->getAllProcessorFeatures();
387387
const SubtargetFeatureKV Feat = FeatTable[Index];
388388
*Feature = Feat.Key;
389389
*Desc = Feat.Desc;

0 commit comments

Comments
 (0)
Please sign in to comment.