commit 6f946f4e7b74d666277362e64d2b37377299898c
author Antonio Maiorano <amaiorano@google.com> Thu Nov 28 13:07:51 2019 -0500
committer Antonio Maiorano <amaiorano@google.com> Thu Dec 05 14:21:49 2019 +0000
tree a831f286c35cbe45526d2084032c437cfe734e11
parent dee5b5f3cf3f891122e725a79cc321c400d35a67

Subzero: fix assert when dumping unnamed constant

This is for debugging, when ALLOW_DUMP=1.

Bug: b/130459196
Change-Id: I734d73b6996e4c3e53e38f65e47fa7f1b04bfe67
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38869
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

third_party/subzero/src/IceOperand.cpp

diff --git a/third_party/subzero/src/IceOperand.cpp b/third_party/subzero/src/IceOperand.cpp
index 043583e..d5ec6dd 100644
--- a/third_party/subzero/src/IceOperand.cpp
+++ b/third_party/subzero/src/IceOperand.cpp
@@ -617,7 +617,7 @@
     Str << EmitString;
     return;
   }
-  Str << "@" << Name;
+  Str << "@" << (Name.hasStdString() ? Name.toString() : "<Unnamed>") ;
   const RelocOffsetT Offset = getOffset();
   if (Offset) {
     if (Offset >= 0) {