aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/src/objects/script.h
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2019-03-12 09:01:49 +0100
committerMichaël Zasso <targos@protonmail.com>2019-03-14 18:49:21 +0100
commit7b48713334469818661fe276cf571de9c7899f2d (patch)
tree4dbda49ac88db76ce09dc330a0cb587e68e139ba /deps/v8/src/objects/script.h
parent8549ac09b256666cf5275224ec58fab9939ff32e (diff)
downloadandroid-node-v8-7b48713334469818661fe276cf571de9c7899f2d.tar.gz
android-node-v8-7b48713334469818661fe276cf571de9c7899f2d.tar.bz2
android-node-v8-7b48713334469818661fe276cf571de9c7899f2d.zip
deps: update V8 to 7.3.492.25
PR-URL: https://github.com/nodejs/node/pull/25852 Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps/v8/src/objects/script.h')
-rw-r--r--deps/v8/src/objects/script.h52
1 files changed, 28 insertions, 24 deletions
diff --git a/deps/v8/src/objects/script.h b/deps/v8/src/objects/script.h
index bd789ba2ff..12c9a4eeac 100644
--- a/deps/v8/src/objects/script.h
+++ b/deps/v8/src/objects/script.h
@@ -7,6 +7,7 @@
#include "src/objects.h"
#include "src/objects/fixed-array.h"
+#include "src/objects/struct.h"
// Has to be the last include (doesn't have include guards):
#include "src/objects/object-macros.h"
@@ -15,8 +16,9 @@ namespace v8 {
namespace internal {
// Script describes a script which has been added to the VM.
-class Script : public Struct, public NeverReadOnlySpaceObject {
+class Script : public Struct {
public:
+ NEVER_READ_ONLY_SPACE
// Script types.
enum Type {
TYPE_NATIVE = 0,
@@ -123,7 +125,7 @@ class Script : public Struct, public NeverReadOnlySpaceObject {
// resource is accessible. Otherwise, always return true.
inline bool HasValidSource();
- Object* GetNameOrSourceURL();
+ Object GetNameOrSourceURL();
// Retrieve source position from where eval was called.
int GetEvalPosition();
@@ -176,7 +178,7 @@ class Script : public Struct, public NeverReadOnlySpaceObject {
class Iterator {
public:
explicit Iterator(Isolate* isolate);
- Script* Next();
+ Script Next();
private:
WeakArrayList::Iterator iterator_;
@@ -187,26 +189,28 @@ class Script : public Struct, public NeverReadOnlySpaceObject {
DECL_PRINTER(Script)
DECL_VERIFIER(Script)
- static const int kSourceOffset = HeapObject::kHeaderSize;
- static const int kNameOffset = kSourceOffset + kPointerSize;
- static const int kLineOffsetOffset = kNameOffset + kPointerSize;
- static const int kColumnOffsetOffset = kLineOffsetOffset + kPointerSize;
- static const int kContextOffset = kColumnOffsetOffset + kPointerSize;
- static const int kTypeOffset = kContextOffset + kPointerSize;
- static const int kLineEndsOffset = kTypeOffset + kPointerSize;
- static const int kIdOffset = kLineEndsOffset + kPointerSize;
- static const int kEvalFromSharedOrWrappedArgumentsOffset =
- kIdOffset + kPointerSize;
- static const int kEvalFromPositionOffset =
- kEvalFromSharedOrWrappedArgumentsOffset + kPointerSize;
- static const int kSharedFunctionInfosOffset =
- kEvalFromPositionOffset + kPointerSize;
- static const int kFlagsOffset = kSharedFunctionInfosOffset + kPointerSize;
- static const int kSourceUrlOffset = kFlagsOffset + kPointerSize;
- static const int kSourceMappingUrlOffset = kSourceUrlOffset + kPointerSize;
- static const int kHostDefinedOptionsOffset =
- kSourceMappingUrlOffset + kPointerSize;
- static const int kSize = kHostDefinedOptionsOffset + kPointerSize;
+// Layout description.
+#define SCRIPTS_FIELDS(V) \
+ V(kSourceOffset, kTaggedSize) \
+ V(kNameOffset, kTaggedSize) \
+ V(kLineOffsetOffset, kTaggedSize) \
+ V(kColumnOffsetOffset, kTaggedSize) \
+ V(kContextOffset, kTaggedSize) \
+ V(kTypeOffset, kTaggedSize) \
+ V(kLineEndsOffset, kTaggedSize) \
+ V(kIdOffset, kTaggedSize) \
+ V(kEvalFromSharedOrWrappedArgumentsOffset, kTaggedSize) \
+ V(kEvalFromPositionOffset, kTaggedSize) \
+ V(kSharedFunctionInfosOffset, kTaggedSize) \
+ V(kFlagsOffset, kTaggedSize) \
+ V(kSourceUrlOffset, kTaggedSize) \
+ V(kSourceMappingUrlOffset, kTaggedSize) \
+ V(kHostDefinedOptionsOffset, kTaggedSize) \
+ /* Total size. */ \
+ V(kSize, 0)
+
+ DEFINE_FIELD_OFFSET_CONSTANTS(HeapObject::kHeaderSize, SCRIPTS_FIELDS)
+#undef SCRIPTS_FIELDS
private:
// Bit positions in the flags field.
@@ -217,7 +221,7 @@ class Script : public Struct, public NeverReadOnlySpaceObject {
static const int kOriginOptionsMask = ((1 << kOriginOptionsSize) - 1)
<< kOriginOptionsShift;
- DISALLOW_IMPLICIT_CONSTRUCTORS(Script);
+ OBJECT_CONSTRUCTORS(Script, Struct);
};
} // namespace internal