Conditionalize -mergeable-traps to optimized builds only

kubamracek · kubamracek · commit 77f63c36be40 · 2025-03-24T09:04:11.000-07:00
diff --git a/lib/IRGen/IRGenFunction.cpp b/lib/IRGen/IRGenFunction.cpp
@@ -503,7 +503,7 @@ llvm::CallInst *IRBuilder::CreateNonMergeableTrap(IRGenModule &IGM,
     }
   }
 
-  if (!IGM.IRGen.Opts.MergeableTraps) {
+  if (IGM.IRGen.Opts.shouldOptimize() && !IGM.IRGen.Opts.MergeableTraps) {
     // Emit unique side-effecting inline asm calls in order to eliminate
     // the possibility that an LLVM optimization or code generation pass
     // will merge these blocks back together again. We emit an empty asm

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ llvm::CallInst *IRBuilder::CreateNonMergeableTrap(IRGenModule &IGM,`
`503`	`503`	`}`
`504`	`504`	`}`
`505`	`505`
`506`		`- if (!IGM.IRGen.Opts.MergeableTraps) {`
	`506`	`+ if (IGM.IRGen.Opts.shouldOptimize() && !IGM.IRGen.Opts.MergeableTraps) {`
`507`	`507`	`// Emit unique side-effecting inline asm calls in order to eliminate`
`508`	`508`	`// the possibility that an LLVM optimization or code generation pass`
`509`	`509`	`// will merge these blocks back together again. We emit an empty asm`