Fix debug printing of pointers, and a keyed store with smi index error, in X6...

src/string-stream.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 72 matching lines @@
   }
   FmtElm(const Vector<const uc16>& value) : type_(LC_STR) {  // NOLINT
     data_.u_lc_str_ = &value;
   }
   FmtElm(Object* value) : type_(OBJ) {  // NOLINT
     data_.u_obj_ = value;
   }
   FmtElm(Handle<Object> value) : type_(HANDLE) {  // NOLINT
     data_.u_handle_ = value.location();
   }
-  FmtElm(void* value) : type_(INT) {  // NOLINT
-#if V8_HOST_ARCH_64_BIT
-    // TODO(x64): FmtElm needs to treat pointers as pointers, and not as
-    // ints.  This will require adding a pointer type, etc.  For now just
-    // hack it and truncate the pointer.
-    // http://code.google.com/p/v8/issues/detail?id=335
-    data_.u_int_ = 0;
-    UNIMPLEMENTED();
-#else
-    data_.u_int_ = reinterpret_cast<int>(value);
-#endif
+  FmtElm(void* value) : type_(POINTER) {  // NOLINT
+    data_.u_pointer_ = value;
   }
  private:
   friend class StringStream;
-  enum Type { INT, DOUBLE, C_STR, LC_STR, OBJ, HANDLE };
+  enum Type { INT, DOUBLE, C_STR, LC_STR, OBJ, HANDLE, POINTER };
   Type type_;
   union {
     int u_int_;
     double u_double_;
     const char* u_c_str_;
     const Vector<const uc16>* u_lc_str_;
     Object* u_obj_;
     Object** u_handle_;
+    void* u_pointer_;
   } data_;
 };
 
 
 class StringStream {
  public:
   explicit StringStream(StringAllocator* allocator):
     allocator_(allocator),
     capacity_(kInitialCapacity),
     length_(0),
@@ skipping 62 matching lines @@
   bool full() const { return (capacity_ - length_) == 1; }
   int space() const { return capacity_ - length_; }
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StringStream);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_STRING_STREAM_H_