[BOLT] Reset output addresses for deleted blocks (#73429)

maksfb · web-flow · commit f4834255d30d · 2023-11-25T23:23:47.000-08:00
This is a follow-up to #73076. We need to reset output addresses for deleted blocks, otherwise the address translation may mistakenly attribute input address of a deleted block to a non-zero address. While working on a test case, I've discovered that DWARF output ranges were already broken for deleted basic blocks: #73428. I will provide a test case for this PR with a DWARF address range fix PR.
diff --git a/bolt/lib/Core/BinaryFunction.cpp b/bolt/lib/Core/BinaryFunction.cpp
@@ -4190,6 +4190,12 @@ void BinaryFunction::updateOutputValues(const BOLTLinker &Linker) {
                                     ? FF.getAddress() + FF.getImageSize()
                                     : getOutputAddress() + getOutputSize());
   }
+
+  // Reset output addresses for deleted blocks.
+  for (BinaryBasicBlock *BB : DeletedBasicBlocks) {
+    BB->setOutputStartAddress(0);
+    BB->setOutputEndAddress(0);
+  }
 }
 
 DebugAddressRangesVector BinaryFunction::getOutputAddressRanges() const {

Original file line number	Diff line number	Diff line change
`@@ -4190,6 +4190,12 @@ void BinaryFunction::updateOutputValues(const BOLTLinker &Linker) {`
`4190`	`4190`	`? FF.getAddress() + FF.getImageSize()`
`4191`	`4191`	`: getOutputAddress() + getOutputSize());`
`4192`	`4192`	`}`
	`4193`	`+`
	`4194`	`+ // Reset output addresses for deleted blocks.`
	`4195`	`+ for (BinaryBasicBlock *BB : DeletedBasicBlocks) {`
	`4196`	`+ BB->setOutputStartAddress(0);`
	`4197`	`+ BB->setOutputEndAddress(0);`
	`4198`	`+ }`
`4193`	`4199`	`}`
`4194`	`4200`
`4195`	`4201`	`DebugAddressRangesVector BinaryFunction::getOutputAddressRanges() const {`