# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1452875351 28800
# Node ID 8a3fd0269d15ae84d31c34df144297df5ba3c773
# Parent  c0f229d11554dea7901f617459f0832b0ed39b2c# Parent  9273bb6ba33ee6d86694a1d67e9129f303811d97
Merge

diff -r 9273bb6ba33e -r 8a3fd0269d15 jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java
--- a/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java	Fri Jan 15 16:50:19 2016 +0100
+++ b/jvmci/jdk.vm.ci.code/src/jdk/vm/ci/code/CompilationRequestResult.java	Fri Jan 15 08:29:11 2016 -0800
@@ -44,7 +44,6 @@
     private final int inlinedBytecodes;
 
     private CompilationRequestResult(String failureMessage, boolean retry, int inlinedBytecodes) {
-        assert retry == (failureMessage != null) : "must be a message if retryable";
         this.failureMessage = failureMessage;
         this.retry = retry;
         this.inlinedBytecodes = inlinedBytecodes;
diff -r 9273bb6ba33e -r 8a3fd0269d15 src/share/vm/jvmci/systemDictionary_jvmci.hpp
--- a/src/share/vm/jvmci/systemDictionary_jvmci.hpp	Fri Jan 15 16:50:19 2016 +0100
+++ b/src/share/vm/jvmci/systemDictionary_jvmci.hpp	Fri Jan 15 08:29:11 2016 -0800
@@ -58,7 +58,6 @@
   do_klass(DebugInfo_klass,                              jdk_vm_ci_code_DebugInfo,                              Jvmci) \
   do_klass(RegisterSaveLayout_klass,                     jdk_vm_ci_code_RegisterSaveLayout,                     Jvmci) \
   do_klass(BytecodeFrame_klass,                          jdk_vm_ci_code_BytecodeFrame,                          Jvmci) \
-  do_klass(CompilationRequest_klass,                     jdk_vm_ci_code_CompilationRequest,                     Jvmci) \
   do_klass(CompilationRequestResult_klass,               jdk_vm_ci_code_CompilationRequestResult,               Jvmci) \
   do_klass(InstalledCode_klass,                          jdk_vm_ci_code_InstalledCode,                          Jvmci) \
   do_klass(code_Location_klass,                          jdk_vm_ci_code_Location,                               Jvmci) \
diff -r 9273bb6ba33e -r 8a3fd0269d15 src/share/vm/jvmci/vmSymbols_jvmci.hpp
--- a/src/share/vm/jvmci/vmSymbols_jvmci.hpp	Fri Jan 15 16:50:19 2016 +0100
+++ b/src/share/vm/jvmci/vmSymbols_jvmci.hpp	Fri Jan 15 08:29:11 2016 -0800
@@ -63,7 +63,6 @@
   template(jdk_vm_ci_code_Architecture,                           "jdk/vm/ci/code/Architecture")                                          \
   template(jdk_vm_ci_code_BytecodeFrame,                          "jdk/vm/ci/code/BytecodeFrame")                                         \
   template(jdk_vm_ci_code_BytecodePosition,                       "jdk/vm/ci/code/BytecodePosition")                                      \
-  template(jdk_vm_ci_code_CompilationRequest,                     "jdk/vm/ci/code/CompilationRequest")                                    \
   template(jdk_vm_ci_code_CompilationRequestResult,               "jdk/vm/ci/code/CompilationRequestResult")                              \
   template(jdk_vm_ci_code_CompiledCode,                           "jdk/vm/ci/code/CompiledCode")                                          \
   template(jdk_vm_ci_code_DebugInfo,                              "jdk/vm/ci/code/DebugInfo")                                             \