This patch much improves our tracking of whether function is...

src/arm/stub-cache-arm.cc

 // Copyright 2006-2008 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 43 matching lines @@
   __ ldr(ip, MemOperand(ip, offset, LSL, 1));
   __ cmp(name, Operand(ip));
   __ b(ne, &miss);
 
   // Get the code entry from the cache.
   __ mov(ip, Operand(value_offset));
   __ ldr(offset, MemOperand(ip, offset, LSL, 1));
 
   // Check that the flags match what we're looking for.
   __ ldr(offset, FieldMemOperand(offset, Code::kFlagsOffset));
-  __ and_(offset, offset, Operand(~Code::kFlagsTypeMask));
+  __ and_(offset,
+          offset,
+          Operand(~(Code::kFlagsTypeMask | Code::kFlagsICInLoopMask)));

[Kasper Lund, 2009/05/25 09:45:42]

Why not have a constant mask for the combination of the two masks?

   __ cmp(offset, Operand(flags));
   __ b(ne, &miss);
 
   // Restore offset and re-load code entry from cache.
   __ pop(offset);
   __ mov(ip, Operand(value_offset));
   __ ldr(offset, MemOperand(ip, offset, LSL, 1));
 
   // Jump to the first instruction in the code stub.
   __ add(offset, offset, Operand(Code::kHeaderSize - kHeapObjectTag));
@@ skipping 412 matching lines @@
   // Do a tail-call of the compiled function.
   __ Jump(r2);
 
   return GetCodeWithFlags(flags, "LazyCompileStub");
 }
 
 
 Object* CallStubCompiler::CompileCallField(Object* object,
                                            JSObject* holder,
                                            int index,
-                                           String* name) {
+                                           String* name,
+                                           Code::Flags flags) {

[Kevin Millikin (Chromium), 2009/05/25 11:00:42]

Since you've generalized the call site to take flags, you might want to assert
here that the passed flags has type FIELD.

   // ----------- S t a t e -------------
   //  -- lr: return address
   // -----------------------------------
   Label miss;
 
   const int argc = arguments().immediate();
 
   // Get the receiver of the function from the stack into r0.
   __ ldr(r0, MemOperand(sp, argc * kPointerSize));
   // Check that the receiver isn't a smi.
@@ skipping 23 matching lines @@
 
   // Invoke the function.
   __ InvokeFunction(r1, arguments(), JUMP_FUNCTION);
 
   // Handle call cache miss.
   __ bind(&miss);
   Handle<Code> ic = ComputeCallMiss(arguments().immediate());
   __ Jump(ic, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
-  return GetCode(FIELD, name);
+  return GetCodeWithFlags(flags, name);
 }
 
 
 Object* CallStubCompiler::CompileCallConstant(Object* object,
                                               JSObject* holder,
                                               JSFunction* function,
-                                              CheckType check) {
+                                              CheckType check,
+                                              Code::Flags flags) {

[Kevin Millikin (Chromium), 2009/05/25 11:00:42]

Same as above with type CONSTANT_FUNCTION.

   // ----------- S t a t e -------------
   //  -- lr: return address
   // -----------------------------------
   Label miss;
 
   // Get the receiver from the stack
   const int argc = arguments().immediate();
   __ ldr(r1, MemOperand(sp, argc * kPointerSize));
 
   // Check that the receiver isn't a smi.
@@ skipping 97 matching lines @@
   // Handle call cache miss.
   __ bind(&miss);
   Handle<Code> ic = ComputeCallMiss(arguments().immediate());
   __ Jump(ic, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
   String* function_name = NULL;
   if (function->shared()->name()->IsString()) {
     function_name = String::cast(function->shared()->name());
   }
-  return GetCode(CONSTANT_FUNCTION, function_name);
+  return GetCodeWithFlags(flags, function_name);
 }
 
 
 Object* CallStubCompiler::CompileCallInterceptor(Object* object,
                                                  JSObject* holder,
                                                  String* name) {
   // ----------- S t a t e -------------
   //  -- lr: return address
   // -----------------------------------
   Label miss;
@@ skipping 438 matching lines @@
   __ Jump(ic, RelocInfo::CODE_TARGET);
 
   // Return the generated code.
   return GetCode(transition == NULL ? FIELD : MAP_TRANSITION, name);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal