@@ -176,7 +176,7 @@ class DiagnoseUnknownCompileTimeValues : public SILModuleTransform {
176
176
177
177
void verifyLocal (DebugValueInst *DBI) {
178
178
auto Decl = DBI->getDecl ();
179
- if (!Decl || !Decl->isConstVal ())
179
+ if (!Decl || !isa<VarDecl>(Decl) || isa<ParamDecl>(Decl) || ! Decl->isConstVal ())
180
180
return ;
181
181
182
182
auto Value = ConstExprState.getConstantValue (DBI->getOperand ());
@@ -186,8 +186,8 @@ class DiagnoseUnknownCompileTimeValues : public SILModuleTransform {
186
186
LLVM_DEBUG (printSymbolicValueValue (Value, Allocator););
187
187
if (!Value.isConstant ()) {
188
188
getModule ()->getASTContext ().Diags .diagnose (
189
- Decl->getStartLoc (),
190
- diag::require_const_arg_for_parameter );
189
+ Decl->getParentInitializer ()-> getStartLoc (),
190
+ diag::require_const_initializer_for_const );
191
191
}
192
192
}
193
193
@@ -220,19 +220,6 @@ class DiagnoseUnknownCompileTimeValues : public SILModuleTransform {
220
220
auto CalleeParameters = CalleeDecl->getParameters ();
221
221
auto ApplyArgRefs = Apply->getArguments ();
222
222
223
- // LLVM_DEBUG({
224
- // llvm::dbgs() << "\n-------------------------------------------\n";
225
- // llvm::dbgs() << "Apply: ";
226
- // Apply->dump();
227
- // llvm::dbgs() << CalleeDecl->getNameStr() << "\n";
228
- // llvm::dbgs() << "Apply Args: ";
229
- // llvm::dbgs() << ApplyArgRefs.size() << "\n";
230
- // llvm::dbgs() << "CalleeParameters: ";
231
- // llvm::dbgs() << CalleeParameters->size() << "\n";
232
- // llvm::dbgs() << "ArgumentOperandNumber: ";
233
- // llvm::dbgs() << Apply->getArgumentOperandNumber() << "\n";
234
- // });
235
-
236
223
// (AC) TODO: Needs work to correctly match params to args
237
224
bool hasConst = false ;
238
225
for (size_t i = 0 ; i < CalleeParameters->size (); ++i)
0 commit comments