Backed out changeset 3edc5be703be (bug 1554063) for mass test failure…

…s. CLOSED TREE --HG-- rename : mozglue/misc/decimal/Decimal.cpp => mfbt/decimal/Decimal.cpp rename : mozglue/misc/decimal/Decimal.h => mfbt/decimal/Decimal.h rename : mozglue/misc/decimal/UPSTREAM-GIT-SHA => mfbt/decimal/UPSTREAM-GIT-SHA rename : mozglue/misc/decimal/comparison-with-nan.patch => mfbt/decimal/comparison-with-nan.patch rename : mozglue/misc/decimal/fix-wshadow-warnings.patch => mfbt/decimal/fix-wshadow-warnings.patch rename : mozglue/misc/decimal/mfbt-abi-markers.patch => mfbt/decimal/mfbt-abi-markers.patch rename : mozglue/misc/decimal/moz-decimal-utils.h => mfbt/decimal/moz-decimal-utils.h rename : mozglue/misc/decimal/to-moz-dependencies.patch => mfbt/decimal/to-moz-dependencies.patch rename : mozglue/misc/decimal/update.sh => mfbt/decimal/update.sh rename : mozglue/misc/decimal/zero-serialization.patch => mfbt/decimal/zero-serialization.patch
dothq · May 29, 2019 · 372773e · 372773e
1 parent 8f1b2d6
commit 372773e
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 32 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -136,6 +136,7 @@ media/openmax_dl/.*
 media/openmax_il/.*
 media/webrtc/signaling/src/sdp/sipcc/.*
 media/webrtc/trunk/.*
+mfbt/decimal/.*
 mfbt/double-conversion/double-conversion/.*
 mfbt/lz4.*
 mobile/android/geckoview/src/thirdparty/.*
@@ -149,7 +150,6 @@ modules/pdfium/.*
 modules/woff2/.*
 modules/xz-embedded/.*
 modules/zlib/.*
-mozglue/misc/decimal/.*
 netwerk/dns/nsIDNKitInterface.h
 netwerk/sctp/src/.*
 netwerk/srtp/src/.*

diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py
@@ -246,6 +246,7 @@ def check_style(enable_fixup):
     #
     # Examples (filename -> inclname)
     # - "mfbt/Attributes.h"         -> "mozilla/Attributes.h"
+    # - "mfbt/decimal/Decimal.h     -> "mozilla/Decimal.h"
     # - "mozglue/misc/TimeStamp.h   -> "mozilla/TimeStamp.h"
     # - "memory/mozalloc/mozalloc.h -> "mozilla/mozalloc.h"
     # - "js/public/Vector.h"        -> "js/Vector.h"

diff --git a/mozglue/misc/decimal/Decimal.cpp → mfbt/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp → mfbt/decimal/Decimal.cpp
diff --git a/mozglue/misc/decimal/Decimal.h → mfbt/decimal/Decimal.h b/mozglue/misc/decimal/Decimal.h → mfbt/decimal/Decimal.h
diff --git a/mozglue/misc/decimal/UPSTREAM-GIT-SHA → mfbt/decimal/UPSTREAM-GIT-SHA b/mozglue/misc/decimal/UPSTREAM-GIT-SHA → mfbt/decimal/UPSTREAM-GIT-SHA
diff --git a/...ue/misc/decimal/comparison-with-nan.patch → mfbt/decimal/comparison-with-nan.patch b/...ue/misc/decimal/comparison-with-nan.patch → mfbt/decimal/comparison-with-nan.patch
@@ -1,6 +1,6 @@
-diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
---- a/mozglue/misc/decimal/Decimal.cpp
-+++ b/mozglue/misc/decimal/Decimal.cpp
+diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
+--- a/mfbt/decimal/Decimal.cpp
++++ b/mfbt/decimal/Decimal.cpp
 @@ -509,21 +509,25 @@ Decimal Decimal::operator/(const Decimal
      if (remainder > divisor / 2)
          ++result;

diff --git a/...e/misc/decimal/fix-wshadow-warnings.patch → mfbt/decimal/fix-wshadow-warnings.patch b/...e/misc/decimal/fix-wshadow-warnings.patch → mfbt/decimal/fix-wshadow-warnings.patch
@@ -1,6 +1,6 @@
-diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
---- a/mozglue/misc/decimal/Decimal.cpp
-+++ b/mozglue/misc/decimal/Decimal.cpp
+diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
+--- a/mfbt/decimal/Decimal.cpp
++++ b/mfbt/decimal/Decimal.cpp
 @@ -118,18 +118,18 @@ Decimal SpecialValueHandler::value() con
          ASSERT_NOT_REACHED();
          return m_lhs;
@@ -147,9 +147,9 @@ diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
  bool Decimal::operator==(const Decimal& rhs) const
  {
      if (isNaN() || rhs.isNaN())
-diff --git a/mozglue/misc/decimal/Decimal.h b/mozglue/misc/decimal/Decimal.h
---- a/mozglue/misc/decimal/Decimal.h
-+++ b/mozglue/misc/decimal/Decimal.h
+diff --git a/mfbt/decimal/Decimal.h b/mfbt/decimal/Decimal.h
+--- a/mfbt/decimal/Decimal.h
++++ b/mfbt/decimal/Decimal.h
 @@ -88,17 +88,17 @@ public:
          int countDigits() const;
          int exponent() const { return m_exponent; }

diff --git a/mozglue/misc/decimal/mfbt-abi-markers.patch → mfbt/decimal/mfbt-abi-markers.patch b/mozglue/misc/decimal/mfbt-abi-markers.patch → mfbt/decimal/mfbt-abi-markers.patch
@@ -1,6 +1,6 @@
-diff --git a/mozglue/misc/decimal/Decimal.h b/mozglue/misc/decimal/Decimal.h
---- a/mozglue/misc/decimal/Decimal.h
-+++ b/mozglue/misc/decimal/Decimal.h
+diff --git a/mfbt/decimal/Decimal.h b/mfbt/decimal/Decimal.h
+--- a/mfbt/decimal/Decimal.h
++++ b/mfbt/decimal/Decimal.h
 @@ -26,16 +26,18 @@
   * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

diff --git a/mozglue/misc/decimal/moz-decimal-utils.h → mfbt/decimal/moz-decimal-utils.h b/mozglue/misc/decimal/moz-decimal-utils.h → mfbt/decimal/moz-decimal-utils.h
diff --git a/...ue/misc/decimal/to-moz-dependencies.patch → mfbt/decimal/to-moz-dependencies.patch b/...ue/misc/decimal/to-moz-dependencies.patch → mfbt/decimal/to-moz-dependencies.patch
@@ -1,6 +1,6 @@
-diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
---- a/mozglue/misc/decimal/Decimal.cpp
-+++ b/mozglue/misc/decimal/Decimal.cpp
+diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
+--- a/mfbt/decimal/Decimal.cpp
++++ b/mfbt/decimal/Decimal.cpp
 @@ -23,22 +23,20 @@
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
@@ -112,9 +112,9 @@ diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
  }
 
  } // namespace blink
-diff --git a/mozglue/misc/decimal/Decimal.h b/mozglue/misc/decimal/Decimal.h
---- a/mozglue/misc/decimal/Decimal.h
-+++ b/mozglue/misc/decimal/Decimal.h
+diff --git a/mfbt/decimal/Decimal.h b/mfbt/decimal/Decimal.h
+--- a/mfbt/decimal/Decimal.h
++++ b/mfbt/decimal/Decimal.h
 @@ -23,26 +23,49 @@
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

diff --git a/mozglue/misc/decimal/update.sh → mfbt/decimal/update.sh b/mozglue/misc/decimal/update.sh → mfbt/decimal/update.sh
diff --git a/...lue/misc/decimal/zero-serialization.patch → mfbt/decimal/zero-serialization.patch b/...lue/misc/decimal/zero-serialization.patch → mfbt/decimal/zero-serialization.patch
@@ -1,6 +1,6 @@
-diff --git a/mozglue/misc/decimal/Decimal.cpp b/mozglue/misc/decimal/Decimal.cpp
---- a/mozglue/misc/decimal/Decimal.cpp
-+++ b/mozglue/misc/decimal/Decimal.cpp
+diff --git a/mfbt/decimal/Decimal.cpp b/mfbt/decimal/Decimal.cpp
+--- a/mfbt/decimal/Decimal.cpp
++++ b/mfbt/decimal/Decimal.cpp
 @@ -277,17 +277,17 @@ bool Decimal::EncodedData::operator==(co
  }
 

diff --git a/mfbt/moz.build b/mfbt/moz.build
@@ -31,6 +31,7 @@ EXPORTS.mozilla = [
     'Compression.h',
     'DbgMacro.h',
     'DebugOnly.h',
+    'decimal/Decimal.h',
     'DefineEnum.h',
     'DoublyLinkedList.h',
     'EndianUtils.h',
@@ -168,11 +169,16 @@ DEFINES['IMPL_MFBT'] = True
 
 SOURCES += [
     'Compression.cpp',
+    'decimal/Decimal.cpp',
     'lz4.c',
 ]
 
 DisableStlWrapping()
 
+if CONFIG['CC_TYPE'] == 'clang':
+    # Suppress warnings from third-party V8 Decimal code.
+    SOURCES['decimal/Decimal.cpp'].flags += ['-Wno-implicit-fallthrough']
+
 if CONFIG['MOZ_NEEDS_LIBATOMIC']:
     OS_LIBS += ['atomic']
 

diff --git a/mozglue/misc/moz.build b/mozglue/misc/moz.build
@@ -8,7 +8,6 @@ FINAL_LIBRARY = 'mozglue'
 
 EXPORTS.mozilla += [
     'AutoProfilerLabel.h',
-    'decimal/Decimal.h',
     'PlatformConditionVariable.h',
     'PlatformMutex.h',
     'Printf.h',
@@ -78,11 +77,3 @@ else:
         'ConditionVariable_posix.cpp',
         'Mutex_posix.cpp',
     ]
-
-SOURCES += [
-    'decimal/Decimal.cpp',
-]
-
-if CONFIG['CC_TYPE'] == 'clang':
-    # Suppress warnings from third-party V8 Decimal code.
-    SOURCES['decimal/Decimal.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
@@ -80,6 +80,7 @@ media/openmax_dl/
 media/openmax_il/
 media/webrtc/signaling/src/sdp/sipcc/
 media/webrtc/trunk/
+mfbt/decimal/
 mfbt/double-conversion/double-conversion/
 mfbt/lz4.*
 mobile/android/geckoview/src/thirdparty/
@@ -90,7 +91,6 @@ modules/freetype2/
 modules/woff2/
 modules/xz-embedded/
 modules/zlib/
-mozglue/misc/decimal/
 netwerk/dns/nsIDNKitInterface.h
 netwerk/sctp/src/
 netwerk/srtp/src/