Skip to content

Commit

Permalink
rebase to latest main
Browse files Browse the repository at this point in the history
Change-Id: Iac24bbe31251ebbafacb410abbb67f1e32c171d6
  • Loading branch information
lhutton1 committed Mar 21, 2024
1 parent 877729d commit 92c68f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/target/llvm/llvm_instance.cc
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ LLVMTargetInfo::LLVMTargetInfo(LLVMInstance& instance, const TargetJSON& target)
}

// LLVM JIT engine options
if (const Optional<String>& v = target->GetAttr<String>("jit")) {
if (const auto& v = Downcast<Optional<String>>(target.Get("jit"))) {
String value = v.value();
if ((value == "mcjit") || (value == "orcjit")) {
jit_engine_ = value;
Expand Down
2 changes: 1 addition & 1 deletion src/target/parsers/aprofile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static TargetFeatures GetFeatures(TargetJSON target) {

// Check that LLVM has been compiled with the correct target support
auto llvm_instance = std::make_unique<codegen::LLVMInstance>();
codegen::LLVMTargetInfo llvm_backend(*llvm_instance, "llvm");
codegen::LLVMTargetInfo llvm_backend(*llvm_instance, {{"kind", String("llvm")}});
Array<String> targets = llvm_backend.GetAllLLVMTargets();
if ((IsAArch64(mtriple) && !CheckContains(targets, "aarch64")) ||
(IsAArch32(mtriple, mcpu) && !CheckContains(targets, "arm"))) {
Expand Down

0 comments on commit 92c68f2

Please sign in to comment.