6920970: Zero build fixes after 6849984 and 6911204

Thu, 28 Jan 2010 08:36:34 -0800

author
twisti
date
Thu, 28 Jan 2010 08:36:34 -0800
changeset 1632
9e1637a04678
parent 1624
89ca5ab4fa60
child 1633
8d9bfe6a446b

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>

src/cpu/zero/vm/interpreter_zero.cpp file | annotate | diff | comparison | revisions
src/cpu/zero/vm/sharedRuntime_zero.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/cpu/zero/vm/interpreter_zero.cpp	Wed Jan 27 14:06:27 2010 -0800
     1.2 +++ b/src/cpu/zero/vm/interpreter_zero.cpp	Thu Jan 28 08:36:34 2010 -0800
     1.3 @@ -1,6 +1,6 @@
     1.4  /*
     1.5   * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 - * Copyright 2007, 2008 Red Hat, Inc.
     1.7 + * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
     1.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9   *
    1.10   * This code is free software; you can redistribute it and/or modify it
    1.11 @@ -47,6 +47,10 @@
    1.12    return ShouldNotCallThisEntry();
    1.13  }
    1.14  
    1.15 +bool AbstractInterpreter::can_be_compiled(methodHandle m) {
    1.16 +  return true;
    1.17 +}
    1.18 +
    1.19  int AbstractInterpreter::size_activation(methodOop method,
    1.20                                           int tempcount,
    1.21                                           int popframe_extra_args,
     2.1 --- a/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Jan 27 14:06:27 2010 -0800
     2.2 +++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp	Thu Jan 28 08:36:34 2010 -0800
     2.3 @@ -1,6 +1,6 @@
     2.4  /*
     2.5   * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 - * Copyright 2007, 2008, 2009 Red Hat, Inc.
     2.7 + * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
     2.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.9   *
    2.10   * This code is free software; you can redistribute it and/or modify it
    2.11 @@ -47,8 +47,10 @@
    2.12                          int total_args_passed,
    2.13                          int comp_args_on_stack,
    2.14                          const BasicType *sig_bt,
    2.15 -                        const VMRegPair *regs) {
    2.16 -  return new AdapterHandlerEntry(
    2.17 +                        const VMRegPair *regs,
    2.18 +                        AdapterFingerPrint *fingerprint) {
    2.19 +  return AdapterHandlerLibrary::new_entry(
    2.20 +    fingerprint,
    2.21      ShouldNotCallThisStub(),
    2.22      ShouldNotCallThisStub(),
    2.23      ShouldNotCallThisStub());

mercurial