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

Unified Diff: src/x64/macro-assembler-x64.cc

Issue 334243002: Version 3.26.31.4 (merged r21509, r21858, r21525) (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.26
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | test/mjsunit/regress/regress-gvn-ftt.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index 2eb74e55f0c9f71103c351cb92c7fac06028e659..b84174e9e4aac36a869c44adc754f58f195e9759 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -921,6 +921,11 @@ void MacroAssembler::Load(Register dst, const Operand& src, Representation r) {
} else if (r.IsInteger32()) {
movl(dst, src);
} else {
+ if (r.IsHeapObject()) {
+ AssertNotSmi(src);
+ } else if (r.IsSmi()) {
+ AssertSmi(src);
+ }
movp(dst, src);
}
}
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | test/mjsunit/regress/regress-gvn-ftt.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698