Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 28, 2020
2 parents 8a58029 + 0b42b1c commit d2bcab5b69fc01140d3621eb4a4f78a9a2b7e5f3
Showing with 2 additions and 10 deletions.
  1. +2 −2 src/hotspot/share/opto/c2compiler.hpp
  2. +0 −8 src/hotspot/share/opto/compile.hpp
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2020, Oracle and/or its affiliates. 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
@@ -65,7 +65,7 @@ class C2Compiler : public AbstractCompiler {

// Check if the compiler supports an intrinsic for 'method' given the
// the dispatch mode specified by the 'is_virtual' parameter.
virtual bool is_intrinsic_supported(const methodHandle& method, bool is_virtual);
bool is_intrinsic_supported(const methodHandle& method, bool is_virtual);

// Initial size of the code buffer (may be increased at runtime)
static int initial_code_buffer_size(int const_size = initial_const_capacity);
@@ -1012,14 +1012,6 @@ class Compile : public Phase {
int is_fancy_jump, bool pass_tls,
bool save_arg_registers, bool return_pc, DirectiveSet* directive);

// From the TypeFunc signature, generate code to pass arguments
// from Compiled calling convention to Interpreter's calling convention
void Generate_Compiled_To_Interpreter_Graph(const TypeFunc *tf, address interpreter_entry);

// From the TypeFunc signature, generate code to pass arguments
// from Interpreter's calling convention to Compiler's calling convention
void Generate_Interpreter_To_Compiled_Graph(const TypeFunc *tf);

// Are we compiling a method?
bool has_method() { return method() != NULL; }

0 comments on commit d2bcab5

Please sign in to comment.