4 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/StaticAnalyzer/MemRegion.cpp b/clang/lib/StaticAnalyzer/MemRegion.cpp
index d3d72b51a73..eca7619d3fc 100644
--- a/clang/lib/StaticAnalyzer/MemRegion.cpp
+++ b/clang/lib/StaticAnalyzer/MemRegion.cpp
@@ -469,7 +469,7 @@ void RegionRawOffset::dump() const {
 }
 
 void RegionRawOffset::dumpToStream(llvm::raw_ostream& os) const {
-  os << "raw_offset{" << getRegion() << ',' << getByteOffset() << '}';
+  os << "raw_offset{" << getRegion() << ',' << getOffset().getQuantity() << '}';
 }
 
 void StaticGlobalSpaceRegion::dumpToStream(llvm::raw_ostream &os) const {
@@ -855,7 +855,7 @@ RegionRawOffset ElementRegion::getAsArrayOffset() const {
   }
 
   assert(superR && "super region cannot be NULL");
-  return RegionRawOffset(superR, offset.getQuantity());
+  return RegionRawOffset(superR, offset);
 }
 
 RegionOffset MemRegion::getAsOffset() const {
diff --git a/clang/lib/StaticAnalyzer/RegionStore.cpp b/clang/lib/StaticAnalyzer/RegionStore.cpp
index 3c048064f6e..986278e6284 100644
--- a/clang/lib/StaticAnalyzer/RegionStore.cpp
+++ b/clang/lib/StaticAnalyzer/RegionStore.cpp
@@ -86,7 +86,7 @@ BindingKey BindingKey::Make(const MemRegion *R, Kind k) {
     // FIXME: There are some ElementRegions for which we cannot compute
     // raw offsets yet, including regions with symbolic offsets. These will be
     // ignored by the store.
-    return BindingKey(O.getRegion(), O.getByteOffset(), k);
+    return BindingKey(O.getRegion(), O.getOffset().getQuantity(), k);
   }
 
   return BindingKey(R, 0, k);
diff --git a/clang/lib/StaticAnalyzer/SimpleSValBuilder.cpp b/clang/lib/StaticAnalyzer/SimpleSValBuilder.cpp
index a6432121f54..6c65da4635b 100644
--- a/clang/lib/StaticAnalyzer/SimpleSValBuilder.cpp
+++ b/clang/lib/StaticAnalyzer/SimpleSValBuilder.cpp
@@ -724,8 +724,8 @@ SVal SimpleSValBuilder::evalBinOpLL(const GRState *state,
 
       if (LeftOffset.getRegion() != NULL &&
           LeftOffset.getRegion() == RightOffset.getRegion()) {
-        int64_t left = LeftOffset.getByteOffset();
-        int64_t right = RightOffset.getByteOffset();
+        CharUnits left = LeftOffset.getOffset();
+        CharUnits right = RightOffset.getOffset();
 
         switch (op) {
         default:
diff --git a/clang/lib/StaticAnalyzer/Store.cpp b/clang/lib/StaticAnalyzer/Store.cpp
index d162eed2477..fa671a3bb0e 100644
--- a/clang/lib/StaticAnalyzer/Store.cpp
+++ b/clang/lib/StaticAnalyzer/Store.cpp
@@ -147,7 +147,7 @@ const MemRegion *StoreManager::CastRegion(const MemRegion *R, QualType CastToTy)
       if (!baseR)
         return NULL;
 
-      CharUnits off = CharUnits::fromQuantity(rawOff.getByteOffset());
+      CharUnits off = rawOff.getOffset();
 
       if (off.isZero()) {
         // Edge case: we are at 0 bytes off the beginning of baseR.  We