Modified: trunk/Source/_javascript_Core/ChangeLog (131681 => 131682)
--- trunk/Source/_javascript_Core/ChangeLog 2012-10-18 00:47:53 UTC (rev 131681)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-10-18 00:54:20 UTC (rev 131682)
@@ -1,3 +1,9 @@
+2012-10-17 Sam Weinig <[email protected]>
+
+ Attempt to fix the build.
+
+ * bytecode/GlobalResolveInfo.h: Copied from bytecode/GlobalResolveInfo.h.
+
2012-10-17 Oliver Hunt <[email protected]>
Roll out r131645 as it causes random site crashes.
Copied: trunk/Source/_javascript_Core/bytecode/GlobalResolveInfo.h (from rev 131552, trunk/Source/_javascript_Core/bytecode/GlobalResolveInfo.h) (0 => 131682)
--- trunk/Source/_javascript_Core/bytecode/GlobalResolveInfo.h (rev 0)
+++ trunk/Source/_javascript_Core/bytecode/GlobalResolveInfo.h 2012-10-18 00:54:20 UTC (rev 131682)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GlobalResolveInfo_h
+#define GlobalResolveInfo_h
+
+#include "WriteBarrier.h"
+
+namespace JSC {
+
+struct GlobalResolveInfo {
+ GlobalResolveInfo() { }
+
+ GlobalResolveInfo(unsigned bytecodeOffset)
+ : offset(0)
+ , bytecodeOffset(bytecodeOffset)
+ {
+ }
+
+ WriteBarrier<Structure> structure;
+ PropertyOffset offset;
+ unsigned bytecodeOffset; // Only valid in old JIT code. This means nothing in the DFG.
+};
+
+inline unsigned getGlobalResolveInfoBytecodeOffset(GlobalResolveInfo* globalResolveInfo)
+{
+ return globalResolveInfo->bytecodeOffset;
+}
+
+} // namespace JSC
+
+#endif // GlobalResolveInfo_h
+
