diff --git a/gen/functions.cpp b/gen/functions.cpp index f0ec182339..5b8539c810 100644 --- a/gen/functions.cpp +++ b/gen/functions.cpp @@ -571,9 +571,9 @@ void DtoDeclareFunction(FuncDeclaration *fdecl) { declareRuntimeCompiledFunction(gIR, irFunc); } - if (irFunc->targetCpuOverriden || - irFunc->targetFeaturesOverriden) { - gIR->targetCpuOrFeaturesOverriden.push_back(irFunc); + if (irFunc->targetCpuOverridden || + irFunc->targetFeaturesOverridden) { + gIR->targetCpuOrFeaturesOverridden.push_back(irFunc); } // main diff --git a/gen/irstate.h b/gen/irstate.h index 1e4050b99d..81157cc9f2 100644 --- a/gen/irstate.h +++ b/gen/irstate.h @@ -223,7 +223,7 @@ public: void replaceGlobals(); // List of functions with cpu or features attributes overriden by user - std::vector targetCpuOrFeaturesOverriden; + std::vector targetCpuOrFeaturesOverridden; struct RtCompiledFuncDesc { llvm::GlobalVariable *thunkVar; diff --git a/gen/runtimecompile.cpp b/gen/runtimecompile.cpp index 2ca3f8633f..ab5c2634bc 100644 --- a/gen/runtimecompile.cpp +++ b/gen/runtimecompile.cpp @@ -227,7 +227,7 @@ void removeFunctionsTargets(IRState *irs, llvm::Module &module) { assert(nullptr != irs); std::unordered_map funcMap; - for (auto &&fun : irs->targetCpuOrFeaturesOverriden) { + for (auto &&fun : irs->targetCpuOrFeaturesOverridden) { assert(nullptr != fun); funcMap.insert({fun->getLLVMFunc()->getName(), fun}); } @@ -239,11 +239,11 @@ void removeFunctionsTargets(IRState *irs, llvm::Module &module) { auto it = funcMap.find(fun.getName()); if (funcMap.end() != it) { auto irFunc = it->second; - if (!irFunc->targetCpuOverriden) { + if (!irFunc->targetCpuOverridden) { fun.removeFnAttr("target-cpu"); } - if (!irFunc->targetFeaturesOverriden) { + if (!irFunc->targetFeaturesOverridden) { fun.removeFnAttr("target-features"); } } else { diff --git a/gen/uda.cpp b/gen/uda.cpp index 3b3ba9d75e..342db80146 100644 --- a/gen/uda.cpp +++ b/gen/uda.cpp @@ -328,7 +328,7 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func, IrFunction *ir if (!CPU.empty()) { func->addFnAttr("target-cpu", CPU); - irFunc->targetCpuOverriden = true; + irFunc->targetCpuOverridden = true; } if (!features.empty()) { @@ -338,7 +338,7 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func, IrFunction *ir sort(features.begin(), features.end()); func->addFnAttr("target-features", llvm::join(features.begin(), features.end(), ",")); - irFunc->targetFeaturesOverriden = true; + irFunc->targetFeaturesOverridden = true; } } diff --git a/ir/irfunction.h b/ir/irfunction.h index f8a741dee4..6477d398ee 100644 --- a/ir/irfunction.h +++ b/ir/irfunction.h @@ -82,10 +82,10 @@ struct IrFunction { llvm::FastMathFlags FMF; /// target CPU was overriden by attribute - bool targetCpuOverriden = false; + bool targetCpuOverridden = false; /// target features was overriden by attributes - bool targetFeaturesOverriden = false; + bool targetFeaturesOverridden = false; /// This functions was marked for dynamic compilation bool runtimeCompile = false;