JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / llint / LLIntOffsetsExtractor.cpp

diff --git a/llint/LLIntOffsetsExtractor.cpp b/llint/LLIntOffsetsExtractor.cpp
index f863cb2181c8966ff737a50da00d4d48307d4c70..5e16174405a8316d7b0181b8a115b035633ceb92 100644 (file)
--- a/llint/LLIntOffsetsExtractor.cpp
+++ b/llint/LLIntOffsetsExtractor.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -25,7 +25,12 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

+#include "ArrayProfile.h"

 #include "CodeBlock.h"
 #include "CodeBlock.h"

+#include "CommonSlowPaths.h"
+#include "Debugger.h"
+#include "DirectArguments.h"
+#include "Exception.h"

 #include "Executable.h"
 #include "Heap.h"
 #include "Interpreter.h"
 #include "Executable.h"
 #include "Heap.h"
 #include "Interpreter.h"


@@ -33,26 +38,29 @@
 #include "JSArray.h"
 #include "JSCell.h"
 #include "JSFunction.h"
 #include "JSArray.h"
 #include "JSCell.h"
 #include "JSFunction.h"

-#include "JSGlobalData.h"
+#include "VM.h"
+#include "JSEnvironmentRecord.h"

 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "JSGlobalObject.h"
 #include "JSObject.h"

-#include "JSPropertyNameIterator.h"
+#include "JSStack.h"

 #include "JSString.h"
 #include "JSTypeInfo.h"
 #include "JSString.h"
 #include "JSTypeInfo.h"

-#include "JSVariableObject.h"

 #include "JumpTable.h"
 #include "LLIntOfflineAsmConfig.h"
 #include "MarkedSpace.h"
 #include "JumpTable.h"
 #include "LLIntOfflineAsmConfig.h"
 #include "MarkedSpace.h"

-#include "RegisterFile.h"
-#include "ScopeChain.h"
+#include "ProtoCallFrame.h"

 #include "Structure.h"
 #include "StructureChain.h"
 #include "Structure.h"
 #include "StructureChain.h"

+#include "TypeProfiler.h"
+#include "TypeProfilerLog.h"
+#include "VMEntryRecord.h"

 #include "ValueProfile.h"
 #include <wtf/text/StringImpl.h>
 
 #include "ValueProfile.h"
 #include <wtf/text/StringImpl.h>
 

+

 namespace JSC {
 
 namespace JSC {
 

-#define OFFLINE_ASM_OFFSETOF(clazz, field) OBJECT_OFFSETOF(clazz, field)
+#define OFFLINE_ASM_OFFSETOF(clazz, field) (static_cast<unsigned>(OBJECT_OFFSETOF(clazz, field)))

 
 class LLIntOffsetsExtractor {
 public:
 
 class LLIntOffsetsExtractor {
 public:


@@ -61,7 +69,6 @@ public:
 
 const unsigned* LLIntOffsetsExtractor::dummy()
 {
 
 const unsigned* LLIntOffsetsExtractor::dummy()
 {

-#if ENABLE(JIT)

 // This is a file generated by offlineasm/generate_offsets_extractor.rb, and contains code
 // to create a table of offsets, sizes, and a header identifying what combination of
 // Platform.h macros we have set. We include it inside of a method on LLIntOffsetsExtractor
 // This is a file generated by offlineasm/generate_offsets_extractor.rb, and contains code
 // to create a table of offsets, sizes, and a header identifying what combination of
 // Platform.h macros we have set. We include it inside of a method on LLIntOffsetsExtractor


@@ -70,9 +77,6 @@ const unsigned* LLIntOffsetsExtractor::dummy()
 // compiler to kindly step aside and yield to our best intentions.
 #include "LLIntDesiredOffsets.h"
     return extractorTable;
 // compiler to kindly step aside and yield to our best intentions.
 #include "LLIntDesiredOffsets.h"
     return extractorTable;

-#else
-    return 0;
-#endif

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC