Mercurial > hg > truffle

changeset 1197:9e1637a04678

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6920970: Zero build fixes after 6849984 and 6911204 Summary: Two recent commits broke the build on Zero. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>
author twisti
date Thu, 28 Jan 2010 08:36:34 -0800
parents 89ca5ab4fa60
children 8d9bfe6a446b
files src/cpu/zero/vm/interpreter_zero.cpp src/cpu/zero/vm/sharedRuntime_zero.cpp
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/interpreter_zero.cpp	Wed Jan 27 14:06:27 2010 -0800
+++ b/src/cpu/zero/vm/interpreter_zero.cpp	Thu Jan 28 08:36:34 2010 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,10 @@
   return ShouldNotCallThisEntry();
 }
 
+bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+  return true;
+}
+
 int AbstractInterpreter::size_activation(methodOop method,
                                          int tempcount,
                                          int popframe_extra_args,
--- a/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Jan 27 14:06:27 2010 -0800
+++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp	Thu Jan 28 08:36:34 2010 -0800
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,8 +47,10 @@
                         int total_args_passed,
                         int comp_args_on_stack,
                         const BasicType *sig_bt,
-                        const VMRegPair *regs) {
-  return new AdapterHandlerEntry(
+                        const VMRegPair *regs,
+                        AdapterFingerPrint *fingerprint) {
+  return AdapterHandlerLibrary::new_entry(
+    fingerprint,
     ShouldNotCallThisStub(),
     ShouldNotCallThisStub(),
     ShouldNotCallThisStub());