For fastcc on x86, let ECX be used as a return register after EAX and EDX

[oota-llvm.git] / lib / Support / Twine.cpp

diff --git a/lib/Support/Twine.cpp b/lib/Support/Twine.cpp
index 4c34d279e8fdd1a6be194d53f57db081e45d2f18..292c0c2b9e5e53772ab3a38240a311f2908aa898 100644 (file)
--- a/lib/Support/Twine.cpp
+++ b/lib/Support/Twine.cpp
@@ -8,14 +8,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/Twine.h"
+#include "llvm/ADT/SmallString.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
 std::string Twine::str() const {
-  std::string Res;
-  raw_string_ostream OS(Res);
-  print(OS);
-  return Res;
+  SmallString<256> Vec;
+  toVector(Vec);
+  return std::string(Vec.begin(), Vec.end());
 }
 
 void Twine::toVector(SmallVectorImpl<char> &Out) const {
@@ -28,6 +28,9 @@ void Twine::printOneChild(raw_ostream &OS, const void *Ptr,
   switch (Kind) {
   case Twine::NullKind: break;
   case Twine::EmptyKind: break;
+  case Twine::TwineKind:
+    static_cast<const Twine*>(Ptr)->print(OS); 
+    break;
   case Twine::CStringKind: 
     OS << static_cast<const char*>(Ptr); 
     break;
@@ -37,8 +40,26 @@ void Twine::printOneChild(raw_ostream &OS, const void *Ptr,
   case Twine::StringRefKind:
     OS << *static_cast<const StringRef*>(Ptr); 
     break;
-  case Twine::TwineKind:
-    static_cast<const Twine*>(Ptr)->print(OS); 
+  case Twine::DecUIKind:
+    OS << *static_cast<const unsigned int*>(Ptr);
+    break;
+  case Twine::DecIKind:
+    OS << *static_cast<const int*>(Ptr);
+    break;
+  case Twine::DecULKind:
+    OS << *static_cast<const unsigned long*>(Ptr);
+    break;
+  case Twine::DecLKind:
+    OS << *static_cast<const long*>(Ptr);
+    break;
+  case Twine::DecULLKind:
+    OS << *static_cast<const unsigned long long*>(Ptr);
+    break;
+  case Twine::DecLLKind:
+    OS << *static_cast<const long long*>(Ptr);
+    break;
+  case Twine::UHexKind:
+    OS.write_hex(*static_cast<const uint64_t*>(Ptr));
     break;
   }
 }
@@ -50,21 +71,42 @@ void Twine::printOneChildRepr(raw_ostream &OS, const void *Ptr,
     OS << "null"; break;
   case Twine::EmptyKind:
     OS << "empty"; break;
+  case Twine::TwineKind:
+    OS << "rope:";
+    static_cast<const Twine*>(Ptr)->printRepr(OS);
+    break;
   case Twine::CStringKind:
-    OS << "cstring:\"" 
-       << static_cast<const char*>(Ptr) << "\""; 
+    OS << "cstring:\""
+       << static_cast<const char*>(Ptr) << "\"";
     break;
   case Twine::StdStringKind:
-    OS << "std::string:\"" 
-       << *static_cast<const std::string*>(Ptr) << "\""; 
+    OS << "std::string:\""
+       << static_cast<const std::string*>(Ptr) << "\"";
     break;
   case Twine::StringRefKind:
-    OS << "stringref:\"" 
-       << *static_cast<const StringRef*>(Ptr) << "\""; 
+    OS << "stringref:\""
+       << static_cast<const StringRef*>(Ptr) << "\"";
     break;
-  case Twine::TwineKind:
-    OS << "rope:";
-    static_cast<const Twine*>(Ptr)->printRepr(OS);
+  case Twine::DecUIKind:
+    OS << "decUI:\"" << *static_cast<const unsigned int*>(Ptr) << "\"";
+    break;
+  case Twine::DecIKind:
+    OS << "decI:\"" << *static_cast<const int*>(Ptr) << "\"";
+    break;
+  case Twine::DecULKind:
+    OS << "decUL:\"" << *static_cast<const unsigned long*>(Ptr) << "\"";
+    break;
+  case Twine::DecLKind:
+    OS << "decL:\"" << *static_cast<const long*>(Ptr) << "\"";
+    break;
+  case Twine::DecULLKind:
+    OS << "decULL:\"" << *static_cast<const unsigned long long*>(Ptr) << "\"";
+    break;
+  case Twine::DecLLKind:
+    OS << "decLL:\"" << *static_cast<const long long*>(Ptr) << "\"";
+    break;
+  case Twine::UHexKind:
+    OS << "uhex:\"" << static_cast<const uint64_t*>(Ptr) << "\"";
     break;
   }
 }