--- a/src/hotspot/share/ci/ciSignature.cpp	Tue May 14 11:28:44 2019 -0400
+++ b/src/hotspot/share/ci/ciSignature.cpp	Tue May 14 11:29:18 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -58,16 +58,9 @@
     if (!ss.is_object()) {
       type = ciType::make(ss.type());
     } else {
-      Symbol* name = ss.as_symbol(THREAD);
-      if (HAS_PENDING_EXCEPTION) {
-        type = ss.is_array() ? (ciType*)ciEnv::unloaded_ciobjarrayklass()
-          : (ciType*)ciEnv::unloaded_ciinstance_klass();
-        env->record_out_of_memory_failure();
-        CLEAR_PENDING_EXCEPTION;
-      } else {
-        ciSymbol* klass_name = env->get_symbol(name);
-        type = env->get_klass_by_name_impl(_accessing_klass, cpool, klass_name, false);
-      }
+      Symbol* name = ss.as_symbol();
+      ciSymbol* klass_name = env->get_symbol(name);
+      type = env->get_klass_by_name_impl(_accessing_klass, cpool, klass_name, false);
     }
     _types->append(type);
     if (ss.at_return_type()) {