Merge bleeding_edge.

src/log.h

 // Copyright 2012 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 453 matching lines @@
   virtual void CodeCreateEvent(Logger::LogEventsAndTags tag,
                                Code* code,
                                SharedFunctionInfo* shared,
                                CompilationInfo* info,
                                Name* name) = 0;
   virtual void CodeCreateEvent(Logger::LogEventsAndTags tag,
                                Code* code,
                                SharedFunctionInfo* shared,
                                CompilationInfo* info,
                                Name* source,
-                               int line) = 0;
+                               int line, int column) = 0;
   virtual void CodeCreateEvent(Logger::LogEventsAndTags tag,
                                Code* code,
                                int args_count) = 0;
   virtual void CallbackEvent(Name* name, Address entry_point) = 0;
   virtual void GetterCallbackEvent(Name* name, Address entry_point) = 0;
   virtual void SetterCallbackEvent(Name* name, Address entry_point) = 0;
   virtual void RegExpCodeCreateEvent(Code* code, String* source) = 0;
   virtual void CodeMoveEvent(Address from, Address to) = 0;
   virtual void CodeDeleteEvent(Address from) = 0;
   virtual void SharedFunctionInfoMoveEvent(Address from, Address to) = 0;
@@ skipping 18 matching lines @@
   virtual void CodeCreateEvent(Logger::LogEventsAndTags tag,
                                Code* code,
                                SharedFunctionInfo* shared,
                                CompilationInfo* info,
                                Name* name);
   virtual void CodeCreateEvent(Logger::LogEventsAndTags tag,
                                Code* code,
                                SharedFunctionInfo* shared,
                                CompilationInfo* info,
                                Name* source,
-                               int line);
+                               int line, int column);
   virtual void RegExpCodeCreateEvent(Code* code, String* source);
 
   virtual void CallbackEvent(Name* name, Address entry_point) { }
   virtual void GetterCallbackEvent(Name* name, Address entry_point) { }
   virtual void SetterCallbackEvent(Name* name, Address entry_point) { }
   virtual void SharedFunctionInfoMoveEvent(Address from, Address to) { }
   virtual void CodeMovingGCEvent() { }
 
  private:
   class NameBuffer;
 
   virtual void LogRecordedBuffer(Code* code,
                                  SharedFunctionInfo* shared,
                                  const char* name,
                                  int length) = 0;
 
   NameBuffer* name_buffer_;
 };
 
 
 } }  // namespace v8::internal
 
 
 #endif  // V8_LOG_H_