@@ -126,7 +126,7 @@ OwningOpRef<spirv::ModuleOp> combine(ArrayRef<spirv::ModuleOp> inputModules,
126
126
unsigned lastUsedID = 0 ;
127
127
128
128
for (auto inputModule : inputModules) {
129
- spirv::ModuleOp moduleClone = inputModule.clone ();
129
+ OwningOpRef< spirv::ModuleOp> moduleClone = inputModule.clone ();
130
130
131
131
// In the combined module, rename all symbols that conflict with symbols
132
132
// from the current input module. This renaming applies to all ops except
@@ -141,7 +141,7 @@ OwningOpRef<spirv::ModuleOp> combine(ArrayRef<spirv::ModuleOp> inputModules,
141
141
StringRef oldSymName = symbolOp.getName ();
142
142
143
143
if (!isa<FuncOp>(op) &&
144
- failed (updateSymbolAndAllUses (symbolOp, combinedModule, moduleClone,
144
+ failed (updateSymbolAndAllUses (symbolOp, combinedModule, * moduleClone,
145
145
lastUsedID)))
146
146
return nullptr ;
147
147
@@ -170,14 +170,14 @@ OwningOpRef<spirv::ModuleOp> combine(ArrayRef<spirv::ModuleOp> inputModules,
170
170
171
171
// In the current input module, rename all symbols that conflict with
172
172
// symbols from the combined module. This includes renaming spv.funcs.
173
- for (auto &op : *moduleClone. getBody ()) {
173
+ for (auto &op : *moduleClone-> getBody ()) {
174
174
auto symbolOp = dyn_cast<SymbolOpInterface>(op);
175
175
if (!symbolOp)
176
176
continue ;
177
177
178
178
StringRef oldSymName = symbolOp.getName ();
179
179
180
- if (failed (updateSymbolAndAllUses (symbolOp, moduleClone, combinedModule,
180
+ if (failed (updateSymbolAndAllUses (symbolOp, * moduleClone, combinedModule,
181
181
lastUsedID)))
182
182
return nullptr ;
183
183
@@ -203,7 +203,7 @@ OwningOpRef<spirv::ModuleOp> combine(ArrayRef<spirv::ModuleOp> inputModules,
203
203
}
204
204
205
205
// Clone all the module's ops to the combined module.
206
- for (auto &op : *moduleClone. getBody ())
206
+ for (auto &op : *moduleClone-> getBody ())
207
207
combinedModuleBuilder.insert (op.clone ());
208
208
}
209
209
0 commit comments