| Index: tools/llc/llc.cpp
|
| diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
|
| index 64bb6991d8d990e75028acacdcbd5ae1f092b46a..8f9355aaa88d95b7e60f15e408eaf16b02b7f68b 100644
|
| --- a/tools/llc/llc.cpp
|
| +++ b/tools/llc/llc.cpp
|
| @@ -126,7 +126,11 @@ static cl::opt<bool>
|
| PNaClABIVerifyFatalErrors("pnaclabi-verify-fatal-errors",
|
| cl::desc("PNaCl ABI verification errors are fatal"),
|
| cl::init(false));
|
| -// @LOCALMOD-END
|
| +static cl::opt<bool>
|
| +AllowDebugMetadata("pnaclabi-verify-allow-debug",
|
| + cl::desc("Allow debug metadata during PNaCl ABI verification."),
|
| + cl::init(false));
|
| +//// @LOCALMOD-END
|
|
|
| // Determine optimization level.
|
| static cl::opt<char>
|
| @@ -388,7 +392,8 @@ static int compileModule(char **argv, LLVMContext &Context) {
|
| // @LOCALMOD-BEGIN
|
| if (PNaClABIVerify) {
|
| // Verify the module (but not the functions yet)
|
| - ModulePass *VerifyPass = createPNaClABIVerifyModulePass(&ABIErrorReporter);
|
| + ModulePass *VerifyPass = createPNaClABIVerifyModulePass(
|
| + &ABIErrorReporter, AllowDebugMetadata);
|
| VerifyPass->runOnModule(*mod);
|
| CheckABIVerifyErrors(ABIErrorReporter, "Module");
|
| }
|
| @@ -522,7 +527,8 @@ static int compileModule(char **argv, LLVMContext &Context) {
|
| // Add the ABI verifier pass before the analysis and code emission passes.
|
| FunctionPass *FunctionVerifyPass = NULL;
|
| if (PNaClABIVerify) {
|
| - FunctionVerifyPass = createPNaClABIVerifyFunctionsPass(&ABIErrorReporter);
|
| + FunctionVerifyPass = createPNaClABIVerifyFunctionsPass(
|
| + &ABIErrorReporter, AllowDebugMetadata);
|
| PM->add(FunctionVerifyPass);
|
| }
|
| // @LOCALMOD-END
|
|
|