commit 42effa50d92d47f80404ee63808dbde9921e6202
author Ben Murdoch <benm@google.com> Fri Aug 19 16:40:31 2011 +0100
committer Ben Murdoch <benm@google.com> Fri Aug 19 16:49:21 2011 +0100
tree 9f268913a1609e9736575a321d0b9e3d739f2429
parent 6d7cb000ed533f52d745e60663019ff891bb19a8

Merge V8 at r8928: Roll to 3.2.10.37

Bug: 5188807

Change-Id: I0f1fc251f801b222d4dc1647d8a2ec0a8b0f8d83

src/arm/macro-assembler-arm.h

diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
index ab5efb0..8d817c0 100644
--- a/src/arm/macro-assembler-arm.h
+++ b/src/arm/macro-assembler-arm.h
@@ -100,11 +100,13 @@
   void Jump(Register target, Condition cond = al);
   void Jump(byte* target, RelocInfo::Mode rmode, Condition cond = al);
   void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
-  int CallSize(Register target, Condition cond = al);
+  static int CallSize(Register target, Condition cond = al);
   void Call(Register target, Condition cond = al);
-  int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al);
+  static int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al);
   void Call(byte* target, RelocInfo::Mode rmode, Condition cond = al);
-  int CallSize(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
+  static int CallSize(Handle<Code> code,
+                      RelocInfo::Mode rmode,
+                      Condition cond = al);
   void Call(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
   void Ret(Condition cond = al);
 
@@ -957,7 +959,9 @@
                            int num_arguments);
 
   void Jump(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
-  int CallSize(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
+  static int CallSize(intptr_t target,
+                      RelocInfo::Mode rmode,
+                      Condition cond = al);
   void Call(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
 
   // Helper functions for generating invokes.