| Index: src/objects.h
 | 
| diff --git a/src/objects.h b/src/objects.h
 | 
| index bb9ecee0172d71b6348f4e90ed0ee3c7bc5e5850..e18d0a0b1c2d032341d0afed8eff753447b2c48e 100644
 | 
| --- a/src/objects.h
 | 
| +++ b/src/objects.h
 | 
| @@ -1230,6 +1230,8 @@ class Object {
 | 
|    // Prints this object without details to a message accumulator.
 | 
|    void ShortPrint(StringStream* accumulator);
 | 
|  
 | 
| +  void ShortPrint(std::ostream& os);  // NOLINT
 | 
| +
 | 
|    DECLARE_CAST(Object)
 | 
|  
 | 
|    // Layout description.
 | 
| @@ -1241,6 +1243,9 @@ class Object {
 | 
|  
 | 
|    // Prints this object with details.
 | 
|    void Print(std::ostream& os);  // NOLINT
 | 
| +#else
 | 
| +  void Print() { ShortPrint(); }
 | 
| +  void Print(std::ostream& os) { ShortPrint(os); }  // NOLINT
 | 
|  #endif
 | 
|  
 | 
|   private:
 | 
| @@ -2137,6 +2142,8 @@ class JSObject: public JSReceiver {
 | 
|  #ifdef OBJECT_PRINT
 | 
|    void PrintProperties(std::ostream& os);   // NOLINT
 | 
|    void PrintElements(std::ostream& os);     // NOLINT
 | 
| +#endif
 | 
| +#ifdef DEBUG
 | 
|    void PrintTransitions(std::ostream& os);  // NOLINT
 | 
|  #endif
 | 
|  
 | 
| @@ -3063,7 +3070,7 @@ class DescriptorArray: public FixedArray {
 | 
|    static const int kDescriptorValue = 2;
 | 
|    static const int kDescriptorSize = 3;
 | 
|  
 | 
| -#ifdef OBJECT_PRINT
 | 
| +#ifdef DEBUG
 | 
|    // For our gdb macros, we should perhaps change these in the future.
 | 
|    void Print();
 | 
|  
 | 
| @@ -8956,7 +8963,7 @@ class String: public Name {
 | 
|    // Dispatched behavior.
 | 
|    void StringShortPrint(StringStream* accumulator);
 | 
|    void PrintUC16(std::ostream& os, int start = 0, int end = -1);  // NOLINT
 | 
| -#ifdef OBJECT_PRINT
 | 
| +#ifdef DEBUG
 | 
|    char* ToAsciiArray();
 | 
|  #endif
 | 
|    DECLARE_PRINTER(String)
 | 
| 
 |