src/share/vm/shark/sharkNativeWrapper.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009, 2010 Red Hat, Inc.
  * 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

@@ -298,11 +298,10 @@
     builder()->CreateCondBr(
       builder()->CreateICmpNE(result, ConstantPointerNull::get(box_type)),
       not_null, merge);
 
     builder()->SetInsertPoint(not_null);
-#error Needs to be updated for tagged jweak; see JNIHandles.
     Value *unboxed_result = builder()->CreateLoad(result);
     builder()->CreateBr(merge);
 
     builder()->SetInsertPoint(merge);
     PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), 0, "result");