Merged r14969 into trunk branch.

src/arm/code-stubs-arm.cc

 // 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 7457 matching lines @@
   }
 
   if (FLAG_optimize_constructed_arrays) {
     // Figure out the right elements kind
     __ ldr(r3, FieldMemOperand(r1, JSFunction::kPrototypeOrInitialMapOffset));
 
     // Load the map's "bit field 2" into |result|. We only need the first byte,
     // but the following bit field extraction takes care of that anyway.
     __ ldr(r3, FieldMemOperand(r3, Map::kBitField2Offset));
     // Retrieve elements_kind from bit field 2.
-    __ ubfx(r3, r3, Map::kElementsKindShift, Map::kElementsKindBitCount);
+    __ Ubfx(r3, r3, Map::kElementsKindShift, Map::kElementsKindBitCount);
 
     if (FLAG_debug_code) {
       Label done;
       __ cmp(r3, Operand(FAST_ELEMENTS));
       __ b(eq, &done);
       __ cmp(r3, Operand(FAST_HOLEY_ELEMENTS));
       __ Assert(eq,
           "Invalid ElementsKind for InternalArray or InternalPackedArray");
       __ bind(&done);
     }
@@ skipping 18 matching lines @@
     __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
   }
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM