Skip to content

Commit b0c1b9b

Browse files
authored
Fix code quality issues. (#3361)
Fix code quality issues reported by a static analysis tool.
1 parent 0cdcf6d commit b0c1b9b

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

include/LLVMSPIRVOpts.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@ class TranslatorOpts {
273273
}
274274

275275
void setFnVarFeatures(std::vector<uint32_t> Features) noexcept {
276-
FnVarFeatures = Features;
276+
FnVarFeatures = std::move(Features);
277277
}
278278
std::vector<uint32_t> getFnVarFeatures() const noexcept {
279279
return FnVarFeatures;
280280
}
281281

282282
void setFnVarCapabilities(std::vector<uint32_t> Capabilities) noexcept {
283-
FnVarCapabilities = Capabilities;
283+
FnVarCapabilities = std::move(Capabilities);
284284
}
285285
std::vector<uint32_t> getFnVarCapabilities() const noexcept {
286286
return FnVarCapabilities;
@@ -289,7 +289,9 @@ class TranslatorOpts {
289289
void setFnVarSpecEnable(bool Val) noexcept { FnVarSpecEnable = Val; }
290290
bool getFnVarSpecEnable() const noexcept { return FnVarSpecEnable; }
291291

292-
void setFnVarSpvOut(std::string Val) noexcept { FnVarSpvOut = Val; }
292+
void setFnVarSpvOut(std::string Val) noexcept {
293+
FnVarSpvOut = std::move(Val);
294+
}
293295
std::string getFnVarSpvOut() const noexcept { return FnVarSpvOut; }
294296

295297
// Check that options passed to --fnvar-xxx flags make sense. Return true on

lib/SPIRV/libSPIRV/SPIRVFnVar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ bool specializeFnVariants(SPIRVModule *BM, std::string &ErrMsg) {
205205
}
206206

207207
for (const auto &CondExt : CondExtensions) {
208-
const auto Ext = CondExt.first;
208+
const auto &Ext = CondExt.first;
209209
const bool ShouldKeep = CondExt.second;
210210
if (ShouldKeep) {
211211
BM->getExtension().insert(Ext.second);

lib/SPIRV/libSPIRV/SPIRVFnVar.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ class SPIRVConditionalEntryPointINTEL : public SPIRVAnnotation {
5959
TheModule->get<SPIRVFunction>(TheId),
6060
getSizeInWords(TheName) + Variables.size() + 4),
6161
Condition(Condition), ExecModel(TheExecModel), Name(TheName),
62-
Variables(Variables) {}
62+
Variables(std::move(Variables)) {}
6363
SPIRVConditionalEntryPointINTEL()
64-
: SPIRVAnnotation(OpConditionalEntryPointINTEL) {}
64+
: SPIRVAnnotation(OpConditionalEntryPointINTEL), Condition() {}
6565

6666
SPIRVId getCondition() const { return Condition; }
6767
SPIRVExecutionModelKind getExecModel() const { return ExecModel; }
@@ -95,7 +95,7 @@ class SPIRVConditionalExtensionINTEL
9595
SPIRVConditionalExtensionINTEL(SPIRVModule *M, SPIRVId C,
9696
const std::string &SS)
9797
: SPIRVEntryNoId(M, 2 + getSizeInWords(SS)), Condition(C), S(SS) {}
98-
SPIRVConditionalExtensionINTEL() {}
98+
SPIRVConditionalExtensionINTEL() : Condition() {}
9999

100100
std::string getExtensionName() const { return S; }
101101
SPIRVId getCondition() const { return Condition; }
@@ -124,7 +124,7 @@ class SPIRVConditionalCapabilityINTEL
124124
: SPIRVEntryNoId(M, 3), Condition(C), Kind(K) {
125125
updateModuleVersion();
126126
}
127-
SPIRVConditionalCapabilityINTEL() {}
127+
SPIRVConditionalCapabilityINTEL() : Condition(), Kind() {}
128128

129129
SPIRVId getCondition() const { return Condition; }
130130

@@ -202,7 +202,7 @@ class SPIRVSpecConstantTargetINTEL : public SPIRVValue {
202202
validate();
203203
}
204204
// Incomplete constructor
205-
SPIRVSpecConstantTargetINTEL() : SPIRVValue(OC) {}
205+
SPIRVSpecConstantTargetINTEL() : SPIRVValue(OC), NumWords(), Target() {}
206206

207207
SPIRVWord getTarget() const { return Target; }
208208
bool matchesDevice() {
@@ -279,7 +279,8 @@ class SPIRVSpecConstantArchitectureINTEL : public SPIRVValue {
279279
validate();
280280
}
281281
// Incomplete constructor
282-
SPIRVSpecConstantArchitectureINTEL() : SPIRVValue(OC) {}
282+
SPIRVSpecConstantArchitectureINTEL()
283+
: SPIRVValue(OC), Category(), Family(), CmpOp(), Architecture() {}
283284

284285
SPIRVWord getCategory() { return Category; }
285286
SPIRVWord getFamily() { return Family; }
@@ -375,7 +376,7 @@ class SPIRVSpecConstantCapabilitiesINTEL : public SPIRVValue {
375376
validate();
376377
}
377378
// Incomplete constructor
378-
SPIRVSpecConstantCapabilitiesINTEL() : SPIRVValue(OC) {}
379+
SPIRVSpecConstantCapabilitiesINTEL() : SPIRVValue(OC), NumWords() {}
379380

380381
std::vector<SPIRVWord> getCapabilities() const { return Capabilities; }
381382
bool matchesDevice() {

lib/SPIRV/libSPIRV/SPIRVModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ spv_ostream &operator<<(spv_ostream &O, SPIRVModule &M) {
22412241

22422242
for (auto &I : M.getConditionalExtensions()) {
22432243
auto Cond = I.first;
2244-
auto Ext = I.second;
2244+
const auto &Ext = I.second;
22452245
assert(!Ext.empty() && "Invalid conditional extension");
22462246
O << SPIRVConditionalExtensionINTEL(&M, Cond, Ext);
22472247
}

0 commit comments

Comments
 (0)