Merge 6168:6800 from bleeding_edge to experimental/gc branch.

tools/gyp/v8.gyp

-# Copyright 2009 the V8 project authors. All rights reserved.
+# Copyright 2011 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
 #       with the distribution.
@@ skipping 13 matching lines @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
   'variables': {
     'use_system_v8%': 0,
     'msvs_use_common_release': 0,
     'gcc_version%': 'unknown',
     'v8_target_arch%': '<(target_arch)',
     'v8_use_snapshot%': 'true',
+    'v8_use_liveobjectlist%': 'false',
   },
   'conditions': [
     ['use_system_v8==0', {
       'target_defaults': {
         'defines': [
           'ENABLE_LOGGING_AND_PROFILING',
           'ENABLE_DEBUGGER_SUPPORT',
           'ENABLE_VMSTATE_TRACKING',
         ],
         'conditions': [
@@ skipping 14 matching lines @@
                   'V8_TARGET_ARCH_IA32',
                 ],
               }],
               ['v8_target_arch=="x64"', {
                 'defines': [
                   'V8_TARGET_ARCH_X64',
                 ],
               }],
             ],
           }],
+          ['v8_use_liveobjectlist=="true"', {
+            'defines': [
+              'ENABLE_DEBUGGER_SUPPORT',
+              'INSPECTOR',
+              'OBJECT_PRINT',
+              'LIVEOBJECTLIST',
+            ],
+          }],
         ],
         'configurations': {
           'Debug': {
             'defines': [
               'DEBUG',
               '_DEBUG',
               'ENABLE_DISASSEMBLER',
               'V8_ENABLE_CHECKS',
               'OBJECT_PRINT',
             ],
@@ skipping 331 matching lines @@
             '../../src/heap.h',
             '../../src/heap-profiler.cc',
             '../../src/heap-profiler.h',
             '../../src/hydrogen.cc',
             '../../src/hydrogen.h',
             '../../src/hydrogen-instructions.cc',
             '../../src/hydrogen-instructions.h',
             '../../src/ic-inl.h',
             '../../src/ic.cc',
             '../../src/ic.h',
+            '../../src/inspector.cc',
+            '../../src/inspector.h',
             '../../src/interpreter-irregexp.cc',
             '../../src/interpreter-irregexp.h',
             '../../src/jump-target-inl.h',
             '../../src/jump-target.cc',
             '../../src/jump-target.h',
             '../../src/jsregexp.cc',
             '../../src/jsregexp.h',
             '../../src/list-inl.h',
             '../../src/list.h',
+            '../../src/lithium.cc',
+            '../../src/lithium.h',
             '../../src/lithium-allocator.cc',
             '../../src/lithium-allocator.h',
+            '../../src/lithium-allocator-inl.h',
             '../../src/liveedit.cc',
             '../../src/liveedit.h',
+            '../../src/liveobjectlist-inl.h',
+            '../../src/liveobjectlist.cc',
+            '../../src/liveobjectlist.h',
             '../../src/log-inl.h',
             '../../src/log-utils.cc',
             '../../src/log-utils.h',
             '../../src/log.cc',
             '../../src/log.h',
             '../../src/macro-assembler.h',
             '../../src/mark-compact.cc',
             '../../src/mark-compact.h',
             '../../src/memory.h',
             '../../src/messages.cc',
             '../../src/messages.h',
             '../../src/natives.h',
             '../../src/objects-debug.cc',
             '../../src/objects-printer.cc',
             '../../src/objects-inl.h',
             '../../src/objects-visiting.cc',
             '../../src/objects-visiting.h',
             '../../src/objects.cc',
             '../../src/objects.h',
-            '../../src/oprofile-agent.h',
-            '../../src/oprofile-agent.cc',
             '../../src/parser.cc',
             '../../src/parser.h',
             '../../src/platform.h',
             '../../src/preparse-data.cc',
             '../../src/preparse-data.h',
             '../../src/preparser.cc',
             '../../src/preparser.h',
             '../../src/prettyprinter.cc',
             '../../src/prettyprinter.h',
             '../../src/property.cc',
@@ skipping 108 matching lines @@
                 '../../src/arm/constants-arm.cc',
                 '../../src/arm/cpu-arm.cc',
                 '../../src/arm/debug-arm.cc',
                 '../../src/arm/deoptimizer-arm.cc',
                 '../../src/arm/disasm-arm.cc',
                 '../../src/arm/frames-arm.cc',
                 '../../src/arm/frames-arm.h',
                 '../../src/arm/full-codegen-arm.cc',
                 '../../src/arm/ic-arm.cc',
                 '../../src/arm/jump-target-arm.cc',
+                '../../src/arm/lithium-arm.cc',
+                '../../src/arm/lithium-arm.h',
                 '../../src/arm/lithium-codegen-arm.cc',
                 '../../src/arm/lithium-codegen-arm.h',
-                '../../src/arm/lithium-arm.cc',
-                '../../src/arm/lithium-arm.h',
                 '../../src/arm/macro-assembler-arm.cc',
                 '../../src/arm/macro-assembler-arm.h',
                 '../../src/arm/regexp-macro-assembler-arm.cc',
                 '../../src/arm/regexp-macro-assembler-arm.h',
                 '../../src/arm/register-allocator-arm.cc',
                 '../../src/arm/simulator-arm.cc',
                 '../../src/arm/stub-cache-arm.cc',
                 '../../src/arm/virtual-frame-arm-inl.h',
                 '../../src/arm/virtual-frame-arm.cc',
                 '../../src/arm/virtual-frame-arm.h',
@@ skipping 29 matching lines @@
                 '../../src/ia32/debug-ia32.cc',
                 '../../src/ia32/deoptimizer-ia32.cc',
                 '../../src/ia32/disasm-ia32.cc',
                 '../../src/ia32/frames-ia32.cc',
                 '../../src/ia32/frames-ia32.h',
                 '../../src/ia32/full-codegen-ia32.cc',
                 '../../src/ia32/ic-ia32.cc',
                 '../../src/ia32/jump-target-ia32.cc',
                 '../../src/ia32/lithium-codegen-ia32.cc',
                 '../../src/ia32/lithium-codegen-ia32.h',
+                '../../src/ia32/lithium-gap-resolver-ia32.cc',
+                '../../src/ia32/lithium-gap-resolver-ia32.h',
                 '../../src/ia32/lithium-ia32.cc',
                 '../../src/ia32/lithium-ia32.h',
                 '../../src/ia32/macro-assembler-ia32.cc',
                 '../../src/ia32/macro-assembler-ia32.h',
                 '../../src/ia32/regexp-macro-assembler-ia32.cc',
                 '../../src/ia32/regexp-macro-assembler-ia32.h',
                 '../../src/ia32/register-allocator-ia32.cc',
                 '../../src/ia32/stub-cache-ia32.cc',
                 '../../src/ia32/virtual-frame-ia32.cc',
                 '../../src/ia32/virtual-frame-ia32.h',
@@ skipping 19 matching lines @@
                 '../../src/x64/codegen-x64.h',
                 '../../src/x64/cpu-x64.cc',
                 '../../src/x64/debug-x64.cc',
                 '../../src/x64/deoptimizer-x64.cc',
                 '../../src/x64/disasm-x64.cc',
                 '../../src/x64/frames-x64.cc',
                 '../../src/x64/frames-x64.h',
                 '../../src/x64/full-codegen-x64.cc',
                 '../../src/x64/ic-x64.cc',
                 '../../src/x64/jump-target-x64.cc',
+                '../../src/x64/lithium-codegen-x64.cc',
+                '../../src/x64/lithium-codegen-x64.h',
+                '../../src/x64/lithium-gap-resolver-x64.cc',
+                '../../src/x64/lithium-gap-resolver-x64.h',
+                '../../src/x64/lithium-x64.cc',
+                '../../src/x64/lithium-x64.h',
                 '../../src/x64/macro-assembler-x64.cc',
                 '../../src/x64/macro-assembler-x64.h',
                 '../../src/x64/regexp-macro-assembler-x64.cc',
                 '../../src/x64/regexp-macro-assembler-x64.h',
                 '../../src/x64/register-allocator-x64.cc',
                 '../../src/x64/stub-cache-x64.cc',
                 '../../src/x64/virtual-frame-x64.cc',
                 '../../src/x64/virtual-frame-x64.h',
               ],
             }],
@@ skipping 34 matching lines @@
             ['OS=="mac"', {
               'sources': [
                 '../../src/platform-macos.cc',
                 '../../src/platform-posix.cc'
               ]},
             ],
             ['OS=="win"', {
               'sources': [
                 '../../src/platform-win32.cc',
               ],
-              # 4355, 4800 came from common.vsprops
-              'msvs_disabled_warnings': [4355, 4800],
+              'msvs_disabled_warnings': [4351, 4355, 4800],
               'link_settings':  {
                 'libraries': [ '-lwinmm.lib' ],
               },
             }],
             ['OS=="win" and component=="shared_library"', {
               'defines': [
                 'BUILDING_V8_SHARED'
               ],
             }],
           ],
@@ skipping 96 matching lines @@
           'target_name': 'v8_shell',
           'type': 'none',
           'dependencies': [
             'v8'
           ],
         },
       ],
     }],
   ],
 }