src/cpu/x86/vm/c1_Runtime1_x86.cpp

rev 7807 : [mq]: bcast

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2013, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1716,1727 ****
  
  
          // arg0: store_address
          Address store_addr(rbp, 2*BytesPerWord);
  
!         BarrierSet* bs = Universe::heap()->barrier_set();
!         CardTableModRefBS* ct = (CardTableModRefBS*)bs;
          assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
  
          Label done;
          Label runtime;
  
--- 1716,1727 ----
  
  
          // arg0: store_address
          Address store_addr(rbp, 2*BytesPerWord);
  
!         CardTableModRefBS* ct =
!           barrier_set_cast<CardTableModRefBS>(Universe::heap()->barrier_set());
          assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
  
          Label done;
          Label runtime;