File tree Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -3576,8 +3576,7 @@ static void emitCheckHandlerCall(CodeGenFunction &CGF,
35763576 llvm::AttributeList::FunctionIndex, B),
35773577 /* Local=*/ true );
35783578 llvm::CallInst *HandlerCall = CGF.EmitNounwindRuntimeCall (Fn, FnArgs);
3579- NoMerge = NoMerge ||
3580- !CGF.CGM .getCodeGenOpts ().OptimizationLevel ||
3579+ NoMerge = NoMerge || !CGF.CGM .getCodeGenOpts ().OptimizationLevel ||
35813580 (CGF.CurCodeDecl && CGF.CurCodeDecl ->hasAttr <OptimizeNoneAttr>());
35823581 if (NoMerge)
35833582 HandlerCall->addFnAttr (llvm::Attribute::NoMerge);
@@ -3910,8 +3909,7 @@ void CodeGenFunction::EmitTrapCheck(llvm::Value *Checked,
39103909
39113910 llvm::BasicBlock *&TrapBB = TrapBBs[CheckHandlerID];
39123911
3913- NoMerge = NoMerge ||
3914- !CGM.getCodeGenOpts ().OptimizationLevel ||
3912+ NoMerge = NoMerge || !CGM.getCodeGenOpts ().OptimizationLevel ||
39153913 (CurCodeDecl && CurCodeDecl->hasAttr <OptimizeNoneAttr>());
39163914
39173915 if (TrapBB && !NoMerge) {
You can’t perform that action at this time.
0 commit comments