src/cpu/aarch64/vm/macroAssembler_aarch64.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2014, 2015, Red Hat 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
   * under the terms of the GNU General Public License version 2 only, as
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2014, 2015, Red Hat 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
   * under the terms of the GNU General Public License version 2 only, as
*** 75,90 ****
      address  entry_point,              // the entry point
      int      number_of_arguments,      // the number of arguments (w/o thread) to pop after the call
      bool     check_exceptions          // whether to check for pending exceptions after return
    );
  
-   // These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.
-   // The implementation is only non-empty for the InterpreterMacroAssembler,
-   // as only the interpreter handles PopFrame and ForceEarlyReturn requests.
-   virtual void check_and_handle_popframe(Register java_thread);
-   virtual void check_and_handle_earlyret(Register java_thread);
- 
    void call_VM_helper(Register oop_result, address entry_point, int number_of_arguments, bool check_exceptions = true);
  
    // Maximum size of class area in Metaspace when compressed
    uint64_t use_XOR_for_compressed_class_base;
  
--- 75,84 ----
*** 95,104 ****
--- 89,104 ----
                                               (uint64_t)Universe::narrow_klass_base())
           && ((uint64_t)Universe::narrow_klass_base()
               > (1u << log2_intptr(CompressedClassSpaceSize))));
    }
  
+  // These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.
+  // The implementation is only non-empty for the InterpreterMacroAssembler,
+  // as only the interpreter handles PopFrame and ForceEarlyReturn requests.
+  virtual void check_and_handle_popframe(Register java_thread);
+  virtual void check_and_handle_earlyret(Register java_thread);
+ 
    // Biased locking support
    // lock_reg and obj_reg must be loaded up with the appropriate values.
    // swap_reg is killed.
    // tmp_reg must be supplied and must not be rscratch1 or rscratch2
    // Optional slow case is for implementations (interpreter and C1) which branch to