Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1173)

Side by Side Diff: src/arm/macro-assembler-arm.cc

Issue 6973001: Propagate a Failure from GenerateDictionaryNegativeLookup instead of causing GC. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 bind(&done); 1727 bind(&done);
1728 } 1728 }
1729 1729
1730 1730
1731 void MacroAssembler::CallStub(CodeStub* stub, Condition cond) { 1731 void MacroAssembler::CallStub(CodeStub* stub, Condition cond) {
1732 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. 1732 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs.
1733 Call(stub->GetCode(), RelocInfo::CODE_TARGET, cond); 1733 Call(stub->GetCode(), RelocInfo::CODE_TARGET, cond);
1734 } 1734 }
1735 1735
1736 1736
1737 MaybeObject* MacroAssembler::TryCallStub(CodeStub* stub, Condition cond) {
1738 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs.
1739 Object* result;
1740 { MaybeObject* maybe_result = stub->TryGetCode();
1741 if (!maybe_result->ToObject(&result)) return maybe_result;
1742 }
1743 Call(Handle<Code>(Code::cast(result)), RelocInfo::CODE_TARGET, cond);
1744 return result;
1745 }
1746
1747
1737 void MacroAssembler::TailCallStub(CodeStub* stub, Condition cond) { 1748 void MacroAssembler::TailCallStub(CodeStub* stub, Condition cond) {
1738 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. 1749 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs.
1739 Jump(stub->GetCode(), RelocInfo::CODE_TARGET, cond); 1750 Jump(stub->GetCode(), RelocInfo::CODE_TARGET, cond);
1740 } 1751 }
1741 1752
1742 1753
1743 MaybeObject* MacroAssembler::TryTailCallStub(CodeStub* stub, Condition cond) { 1754 MaybeObject* MacroAssembler::TryTailCallStub(CodeStub* stub, Condition cond) {
1744 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs. 1755 ASSERT(allow_stub_calls()); // Stub calls are not allowed in some stubs.
1745 Object* result; 1756 Object* result;
1746 { MaybeObject* maybe_result = stub->TryGetCode(); 1757 { MaybeObject* maybe_result = stub->TryGetCode();
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
3052 void CodePatcher::EmitCondition(Condition cond) { 3063 void CodePatcher::EmitCondition(Condition cond) {
3053 Instr instr = Assembler::instr_at(masm_.pc_); 3064 Instr instr = Assembler::instr_at(masm_.pc_);
3054 instr = (instr & ~kCondMask) | cond; 3065 instr = (instr & ~kCondMask) | cond;
3055 masm_.emit(instr); 3066 masm_.emit(instr);
3056 } 3067 }
3057 3068
3058 3069
3059 } } // namespace v8::internal 3070 } } // namespace v8::internal
3060 3071
3061 #endif // V8_TARGET_ARCH_ARM 3072 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/macro-assembler-arm.h ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698