[vm] Fix extra output in assembly DWARF.

sstrickl · commit-bot@chromium.org · commit fc1ecdae0d1d · 2020-06-12T15:05:35.000Z
Bug: b/158791706 Change-Id: I01289f330242de0216833f3d58c67168b044354f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150986 Auto-Submit: Tess Strickland <sstrickl@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Martin Kustermann <kustermann@google.com>
diff --git a/runtime/vm/image_snapshot.cc b/runtime/vm/image_snapshot.cc
@@ -560,8 +560,11 @@ class DwarfAssemblyStream : public DwarfWriteStream {
     Print(".L%s_end:\n", prefix);
   }
   void OffsetFromSymbol(const char* symbol, intptr_t offset) {
-    if (offset == 0) PrintNamedAddress(symbol);
-    PrintNamedAddressWithOffset(symbol, offset);
+    if (offset == 0) {
+      PrintNamedAddress(symbol);
+    } else {
+      PrintNamedAddressWithOffset(symbol, offset);
+    }
   }
   void DistanceBetweenSymbolOffsets(const char* symbol1,
                                     intptr_t offset1,

Original file line number	Diff line number	Diff line change
`@@ -560,8 +560,11 @@ class DwarfAssemblyStream : public DwarfWriteStream {`
`560`	`560`	`Print(".L%s_end:\n", prefix);`
`561`	`561`	`}`
`562`	`562`	`void OffsetFromSymbol(const char* symbol, intptr_t offset) {`
`563`		`- if (offset == 0) PrintNamedAddress(symbol);`
`564`		`- PrintNamedAddressWithOffset(symbol, offset);`
	`563`	`+ if (offset == 0) {`
	`564`	`+ PrintNamedAddress(symbol);`
	`565`	`+ } else {`
	`566`	`+ PrintNamedAddressWithOffset(symbol, offset);`
	`567`	`+ }`
`565`	`568`	`}`
`566`	`569`	`void DistanceBetweenSymbolOffsets(const char* symbol1,`
`567`	`570`	`intptr_t offset1,`