Revert "[compiler-rt] Reorder functions to have smaller stack frames"

Does not compile.

This reverts commit r308650.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@308651 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/sanitizer_common/sanitizer_printf.cc b/lib/sanitizer_common/sanitizer_printf.cc
index 101c3fb79..b14675a06 100644
--- a/lib/sanitizer_common/sanitizer_printf.cc
+++ b/lib/sanitizer_common/sanitizer_printf.cc
@@ -231,23 +231,17 @@ static void CallPrintfAndReportCallback(const char *str) {
 
 static void SharedPrintfCode(bool append_pid, const char *format,
                              va_list args) {
+  va_list args2;
+  va_copy(args2, args);
+  const int kLen = 16 * 1024;
   // |local_buffer| is small enough not to overflow the stack and/or violate
   // the stack limit enforced by TSan (-Wframe-larger-than=512). On the other
   // hand, the bigger the buffer is, the more the chance the error report will
   // fit into it.
   char local_buffer[400];
-  SharedPrintfCodeNoBuffer(append_pid, local_buffer, ARRAY_SIZE(local_buffer),
-                           format, va_list args);
-}
-
-static void SharedPrintfCodeNoBuffer(bool append_pid, char *local_buffer,
-                                     int buffer_size, const char *format,
-                                     va_list args) {
-  va_list args2;
-  va_copy(args2, args);
-  const int kLen = 16 * 1024;
   int needed_length;
   char *buffer = local_buffer;
+  int buffer_size = ARRAY_SIZE(local_buffer);
   // First try to print a message using a local buffer, and then fall back to
   // mmaped buffer.
   for (int use_mmap = 0; use_mmap < 2; use_mmap++) {