diff -r 2dfa46d6ea7e -r 6627b10e05f8 hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Wed Mar 11 09:11:33 2015 +0100
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Wed Mar 11 12:00:26 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -69,8 +69,6 @@
 
 inline intptr_t* frame::link() const { return (intptr_t *)(fp()[FP->sp_offset_in_saved_window()] + STACK_BIAS); }
 
-inline void frame::set_link(intptr_t* addr) { assert(link()==addr, "frame nesting is controlled by hardware"); }
-
 inline intptr_t* frame::unextended_sp() const { return sp() + _sp_adjustment_by_callee; }
 
 // return address: