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

Side by Side Diff: src/x64/stub-cache-x64.cc

Issue 143333003: Fix issue with context not being saved on x64 introduced in 144543004 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 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 | « no previous file | test/cctest/test-accessors.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 __ PopReturnAddressTo(scratch1); 514 __ PopReturnAddressTo(scratch1);
515 515
516 ASSERT(!holder.is(rsi)); 516 ASSERT(!holder.is(rsi));
517 // context save 517 // context save
518 __ push(rsi); 518 __ push(rsi);
519 519
520 // Get the function and setup the context. 520 // Get the function and setup the context.
521 Handle<JSFunction> function = optimization.constant_function(); 521 Handle<JSFunction> function = optimization.constant_function();
522 __ Move(scratch2, function); 522 __ Move(scratch2, function);
523 __ push(scratch2); 523 __ push(scratch2);
524 __ movp(rsi, FieldOperand(scratch2, JSFunction::kContextOffset));
524 525
525 Isolate* isolate = masm->isolate(); 526 Isolate* isolate = masm->isolate();
526 Handle<CallHandlerInfo> api_call_info = optimization.api_call_info(); 527 Handle<CallHandlerInfo> api_call_info = optimization.api_call_info();
527 Handle<Object> call_data(api_call_info->data(), isolate); 528 Handle<Object> call_data(api_call_info->data(), isolate);
528 // Push data from ExecutableAccessorInfo. 529 // Push data from ExecutableAccessorInfo.
529 bool call_data_undefined = false; 530 bool call_data_undefined = false;
530 if (isolate->heap()->InNewSpace(*call_data)) { 531 if (isolate->heap()->InNewSpace(*call_data)) {
531 __ Move(scratch2, api_call_info); 532 __ Move(scratch2, api_call_info);
532 __ movp(scratch3, FieldOperand(scratch2, CallHandlerInfo::kDataOffset)); 533 __ movp(scratch3, FieldOperand(scratch2, CallHandlerInfo::kDataOffset));
533 } else if (call_data->IsUndefined()) { 534 } else if (call_data->IsUndefined()) {
(...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after
2111 // ----------------------------------- 2112 // -----------------------------------
2112 TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss); 2113 TailCallBuiltin(masm, Builtins::kKeyedLoadIC_Miss);
2113 } 2114 }
2114 2115
2115 2116
2116 #undef __ 2117 #undef __
2117 2118
2118 } } // namespace v8::internal 2119 } } // namespace v8::internal
2119 2120
2120 #endif // V8_TARGET_ARCH_X64 2121 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « no previous file | test/cctest/test-accessors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698