--- old/src/share/vm/c1/c1_ValueSet.hpp	2017-05-22 17:30:21.241973831 +0200
+++ new/src/share/vm/c1/c1_ValueSet.hpp	2017-05-22 17:30:21.132970532 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -27,7 +27,7 @@
 
 #include "c1/c1_Instruction.hpp"
 #include "memory/allocation.hpp"
-#include "utilities/bitMap.inline.hpp"
+#include "utilities/bitMap.hpp"
 
 // A ValueSet is a simple abstraction on top of a BitMap representing
 // a set of Instructions. Currently it assumes that the number of
@@ -52,52 +52,4 @@
   bool equals  (ValueSet* other);
 };
 
-inline ValueSet::ValueSet() : _map(Instruction::number_of_instructions()) {
-}
-
-
-inline ValueSet* ValueSet::copy() {
-  ValueSet* res = new ValueSet();
-  res->_map.set_from(_map);
-  return res;
-}
-
-
-inline bool ValueSet::contains(Value x) {
-  return _map.at(x->id());
-}
-
-
-inline void ValueSet::put(Value x) {
-  _map.set_bit(x->id());
-}
-
-
-inline void ValueSet::remove(Value x) {
-  _map.clear_bit(x->id());
-}
-
-
-inline bool ValueSet::set_intersect(ValueSet* other) {
-  return _map.set_intersection_with_result(other->_map);
-}
-
-
-inline void ValueSet::set_union(ValueSet* other) {
-  _map.set_union(other->_map);
-}
-
-
-inline void ValueSet::clear() {
-  _map.clear();
-}
-
-inline void ValueSet::set_from(ValueSet* other) {
-  _map.set_from(other->_map);
-}
-
-inline bool ValueSet::equals(ValueSet* other) {
-  return _map.is_same(other->_map);
-}
-
 #endif // SHARE_VM_C1_C1_VALUESET_HPP