Subzero: Shorten global prefixes in non-DUMP build.

Reverts part of 843142fe (https://codereview.chromium.org/1776343004).

Makes global prefixes short in all non-DUMP builds, not just the browser
build, so that the user doesn't need to remember to supply the override
options in a command-line MINIMAL build.

BUG= none
R=jpp@chromium.org

Review URL: https://codereview.chromium.org/1805593002 .

src/IceBrowserCompileServer.cpp

diff --git a/src/IceBrowserCompileServer.cpp b/src/IceBrowserCompileServer.cpp
index 30b3f20..284a0c9 100644
--- a/src/IceBrowserCompileServer.cpp
+++ b/src/IceBrowserCompileServer.cpp
@@ -172,13 +172,6 @@
   Flags->setUseSandboxing(true);
   Flags->setOutFileType(FT_Elf);
   Flags->setTargetArch(getTargetArch());
-  // Make the prefixes short to reduce the chance that string construction will
-  // have to resort to malloc().  Note that this won't change anything if the
-  // pexe was finalize with "--no-strip-syms".  TODO(stichnot): This will be
-  // unnecessary when we stop directly constructing strings that are used for
-  // names and lookup keys.
-  Flags->setDefaultFunctionPrefix("F");
-  Flags->setDefaultGlobalPrefix("G");
   ExtraFlags->setBuildOnRead(true);
   ExtraFlags->setInputFileFormat(llvm::PNaClFormat);
 }

src/IceClFlags.cpp

diff --git a/src/IceClFlags.cpp b/src/IceClFlags.cpp
index b944ec0..ddc7f14 100644
--- a/src/IceClFlags.cpp
+++ b/src/IceClFlags.cpp
@@ -84,14 +84,14 @@
     DefaultFunctionPrefix("default-function-prefix",
                           cl::desc("Define default function prefix for naming "
                                    "unnamed functions"),
-                          cl::init("Function"));
+                          cl::init(Ice::BuildDefs::dump() ? "Function" : "F"));
 
 /// Define default global prefix for naming unnamed globals.
 cl::opt<std::string>
     DefaultGlobalPrefix("default-global-prefix",
                         cl::desc("Define default global prefix for naming "
                                  "unnamed globals"),
-                        cl::init("Global"));
+                        cl::init(Ice::BuildDefs::dump() ? "Global" : "G"));
 
 /// Disable hybrid assembly when -filetype=iasm.
 cl::opt<bool> DisableHybridAssembly(