summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-11-12 11:58:39 +0000
committerMoonchild <moonchild@palemoon.org>2020-11-12 11:58:39 +0000
commit4aeaea919588a04e0298cd08b829d8f6d8c276d3 (patch)
tree572a60bc67996fb4086c38d149c601aaeb35fddf
parent0ba1d49ae5564a9e0b141b656a8cdc68e7582baf (diff)
downloaduxp-4aeaea919588a04e0298cd08b829d8f6d8c276d3.tar.gz
Issue #1679 - Part 2: Some small issues to address buildability.
- Explicitly |this| the Asserts in Cell.as<> - Unified deprot in regexp-error.h - Convert RegExpShared* inner() to a reinterpret_cast because for SOME reason .as<> no longer works after the reimport (which is a static cast)
-rw-r--r--js/src/gc/Heap.h4
-rw-r--r--js/src/regexp/regexp-error.h1
-rw-r--r--js/src/regexp/regexp-shim.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index 2089415326..2f27702601 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -280,13 +280,13 @@ struct Cell
template<class T>
inline T* as() {
- MOZ_ASSERT(is<T>());
+ MOZ_ASSERT(this->is<T>());
return static_cast<T*>(this);
}
template <class T>
inline const T* as() const {
- MOZ_ASSERT(is<T>());
+ MOZ_ASSERT(this->is<T>());
return static_cast<const T*>(this);
}
diff --git a/js/src/regexp/regexp-error.h b/js/src/regexp/regexp-error.h
index ef9d037dd3..4b495f07d1 100644
--- a/js/src/regexp/regexp-error.h
+++ b/js/src/regexp/regexp-error.h
@@ -5,6 +5,7 @@
#ifndef V8_REGEXP_REGEXP_ERROR_H_
#define V8_REGEXP_REGEXP_ERROR_H_
+#include "regexp-shim.h"
namespace v8 {
namespace internal {
diff --git a/js/src/regexp/regexp-shim.h b/js/src/regexp/regexp-shim.h
index 6b6a8c6394..7677da084b 100644
--- a/js/src/regexp/regexp-shim.h
+++ b/js/src/regexp/regexp-shim.h
@@ -957,7 +957,7 @@ class JSRegExp : public HeapObject {
private:
js::RegExpShared* inner() {
- return value_.toGCThing()->as<js::RegExpShared>();
+ return reinterpret_cast<js::RegExpShared*>(value_.toGCThing());
}
};