Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/postmortem #706

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@
# Don't bake anything extra into the snapshot.
'v8_use_external_startup_data%': 0,

# Disable V8's post-mortem debugging; frequently broken and hardly used.
'v8_postmortem_support%': 'false',

'conditions': [
['OS == "win"', {
'os_posix': 0,
'v8_postmortem_support%': 'false',
}, {
'os_posix': 1,
'v8_postmortem_support%': 'true',
}],
['GENERATOR == "ninja" or OS== "mac"', {
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/src/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -7062,6 +7062,8 @@ class SharedFunctionInfo: public HeapObject {
static const int kUniqueIdOffset = kFeedbackVectorOffset + kPointerSize;
static const int kLastPointerFieldOffset = kUniqueIdOffset;
#else
// Just to not break the postmortem support with conditional offsets
static const int kUniqueIdOffset = kFeedbackVectorOffset;
static const int kLastPointerFieldOffset = kFeedbackVectorOffset;
#endif

Expand Down
14 changes: 5 additions & 9 deletions deps/v8/tools/gen-postmortem-metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
{ 'name': 'ExternalStringTag', 'value': 'kExternalStringTag' },
{ 'name': 'SlicedStringTag', 'value': 'kSlicedStringTag' },

{ 'name': 'FailureTag', 'value': 'kFailureTag' },
{ 'name': 'FailureTagMask', 'value': 'kFailureTagMask' },
{ 'name': 'HeapObjectTag', 'value': 'kHeapObjectTag' },
{ 'name': 'HeapObjectTagMask', 'value': 'kHeapObjectTagMask' },
{ 'name': 'SmiTag', 'value': 'kSmiTag' },
Expand All @@ -94,8 +92,6 @@
'value': 'DescriptorArray::kFirstIndex' },
{ 'name': 'prop_type_field',
'value': 'FIELD' },
{ 'name': 'prop_type_first_phantom',
'value': 'TRANSITION' },
{ 'name': 'prop_type_mask',
'value': 'PropertyDetails::TypeField::kMask' },
{ 'name': 'prop_index_mask',
Expand All @@ -120,9 +116,9 @@
'value': 'DICTIONARY_ELEMENTS' },

{ 'name': 'bit_field2_elements_kind_mask',
'value': 'Map::kElementsKindMask' },
'value': 'Map::ElementsKindBits::kMask' },
{ 'name': 'bit_field2_elements_kind_shift',
'value': 'Map::kElementsKindShift' },
'value': 'Map::ElementsKindBits::kShift' },
{ 'name': 'bit_field3_dictionary_map_shift',
'value': 'Map::DictionaryMap::kShift' },

Expand Down Expand Up @@ -196,9 +192,9 @@
* This file is generated by %s. Do not edit directly.
*/

#include "v8.h"
#include "frames.h"
#include "frames-inl.h" /* for architecture-specific frame constants */
#include "src/v8.h"
#include "src/frames.h"
#include "src/frames-inl.h" /* for architecture-specific frame constants */

using namespace v8::internal;

Expand Down
6 changes: 3 additions & 3 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -526,10 +526,10 @@
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
'<(OBJ_DIR)/node/src/node_dtrace.o',
'<(OBJ_DIR)/iojs/src/node_dtrace.o',
],
'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
'<(OBJ_DIR)/iojs/src/node_dtrace_provider.o'
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'<@(_inputs)', '-o', '<@(_outputs)' ]
Expand Down Expand Up @@ -579,7 +579,7 @@
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
],
'outputs': [
'<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
'<(OBJ_DIR)/iojs/src/node_dtrace_ustack.o'
],
'conditions': [
[ 'target_arch=="ia32"', {
Expand Down
2 changes: 1 addition & 1 deletion src/v8abbr.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#define V8_StringTag V8DBG_STRINGTAG

#define V8_StringEncodingMask V8DBG_STRINGENCODINGMASK
#define V8_AsciiStringTag V8DBG_ASCIISTRINGTAG
#define V8_AsciiStringTag V8DBG_ONEBYTESTRINGTAG

#define V8_StringRepresentationMask V8DBG_STRINGREPRESENTATIONMASK
#define V8_SeqStringTag V8DBG_SEQSTRINGTAG
Expand Down