Semi-weekly merge from bleeding_edge to the toiger branch.

src/log.cc

Index: src/log.cc
===================================================================
--- src/log.cc	(revision 682)
+++ src/log.cc	(working copy)
@@ -350,11 +350,12 @@
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 void Logger::LogString(Handle<String> str) {
-  int len = str->length();
+  StringShape shape(*str);
+  int len = str->length(shape);
   if (len > 256)
     len = 256;
   for (int i = 0; i < len; i++) {
-    uc32 c = str->Get(i);
+    uc32 c = str->Get(shape, i);
     if (c < 32 || (c > 126 && c <= 255)) {
       fprintf(logfile_, "\\x%02x", c);
     } else if (c > 255) {
@@ -430,7 +431,8 @@
   LogRegExpSource(regexp);
   fprintf(logfile_, ",");
   LogString(input_string);
-  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length());
+  StringShape shape(*input_string);
+  fprintf(logfile_, ",%d..%d\n", start_index, input_string->length(shape));
 #endif
 }