Mercurial > hg > graal-jvmci-8

diff src/cpu/x86/vm/templateTable_x86_64.cpp @ 1330:4a9cc99938e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author acorn
date Fri, 26 Mar 2010 11:10:26 -0400
parents 76c1d7d13ec5
children 2338d41fbd81
line wrap: on
line diff
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Thu Mar 25 16:54:59 2010 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Fri Mar 26 11:10:26 2010 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2860,12 +2860,8 @@
     __ andl(recv, 0xFF);
     if (TaggedStackInterpreter) __ shll(recv, 1);  // index*2
     Address recv_addr(rsp, recv, Address::times_8, -Interpreter::expr_offset_in_bytes(1));
-    if (is_invokedynamic) {
-      __ lea(recv, recv_addr);
-    } else {
-      __ movptr(recv, recv_addr);
-      __ verify_oop(recv);
-    }
+    __ movptr(recv, recv_addr);
+    __ verify_oop(recv);
   }
 
   // do null check if needed