[Isolates] Merge from bleeding_edge, revisions 5934-6100.

src/deoptimizer.cc

 // Copyright 2010 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 1096 matching lines @@
     case LITERAL:
       return 1;
     case FRAME:
       return 3;
   }
   UNREACHABLE();
   return -1;
 }
 
 
-#ifdef DEBUG
+#ifdef OBJECT_PRINT
 
 const char* Translation::StringFor(Opcode opcode) {
   switch (opcode) {
     case BEGIN:
       return "BEGIN";
     case FRAME:
       return "FRAME";
     case REGISTER:
       return "REGISTER";
     case INT32_REGISTER:
@@ skipping 30 matching lines @@
 }
 
 
 DeoptimizingCodeListNode::~DeoptimizingCodeListNode() {
   GlobalHandles* global_handles = Isolate::Current()->global_handles();
   global_handles->Destroy(reinterpret_cast<Object**>(code_.location()));
 }
 
 
 } }  // namespace v8::internal