Title: [237964] tags/Safari-607.1.13/Source/_javascript_Core
- Revision
- 237964
- Author
- alanc...@apple.com
- Date
- 2018-11-07 17:29:25 -0800 (Wed, 07 Nov 2018)
Log Message
Revert r237638. rdar://problem/45895377
Modified Paths
Diff
Modified: tags/Safari-607.1.13/Source/_javascript_Core/ChangeLog (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/ChangeLog 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/ChangeLog 2018-11-08 01:29:25 UTC (rev 237964)
@@ -1,5 +1,9 @@
2018-11-07 Alan Coon <alanc...@apple.com>
+ Revert r237638. rdar://problem/45895377
+
+2018-11-07 Alan Coon <alanc...@apple.com>
+
Revert r237641. rdar://problem/45895377
2018-11-07 Alan Coon <alanc...@apple.com>
Modified: tags/Safari-607.1.13/Source/_javascript_Core/bytecode/MetadataTable.h (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/bytecode/MetadataTable.h 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/bytecode/MetadataTable.h 2018-11-08 01:29:25 UTC (rev 237964)
@@ -56,7 +56,7 @@
auto* metadata = reinterpret_cast<typename Op::Metadata*>(get(Op::opcodeID));
auto* end = reinterpret_cast<typename Op::Metadata*>(getImpl(Op::opcodeID + 1));
- for (; metadata + 1 <= end; ++metadata)
+ for (; metadata != end; ++metadata)
func(*metadata);
}
Modified: tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.cpp (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.cpp 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.cpp 2018-11-08 01:29:25 UTC (rev 237964)
@@ -193,27 +193,11 @@
};
-#if CPU(NEEDS_ALIGNED_ACCESS)
-static unsigned metadataAlignments[] = {
-
-#define METADATA_ALIGNMENT(size) size,
- FOR_EACH_BYTECODE_METADATA_ALIGNMENT(METADATA_ALIGNMENT)
-#undef METADATA_ALIGNMENT
-
-};
-#endif
-
unsigned metadataSize(OpcodeID opcodeID)
{
return metadataSizes[opcodeID];
}
-#if CPU(NEEDS_ALIGNED_ACCESS)
-unsigned metadataAlignment(OpcodeID opcodeID)
-{
- return metadataAlignments[opcodeID];
-}
-#endif
} // namespace JSC
Modified: tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.h (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.h 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/bytecode/Opcode.h 2018-11-08 01:29:25 UTC (rev 237964)
@@ -245,9 +245,6 @@
}
unsigned metadataSize(OpcodeID);
-#if CPU(NEEDS_ALIGNED_ACCESS)
-unsigned metadataAlignment(OpcodeID);
-#endif
} // namespace JSC
Modified: tags/Safari-607.1.13/Source/_javascript_Core/bytecode/UnlinkedMetadataTableInlines.h (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/bytecode/UnlinkedMetadataTableInlines.h 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/bytecode/UnlinkedMetadataTableInlines.h 2018-11-08 01:29:25 UTC (rev 237964)
@@ -91,15 +91,8 @@
unsigned offset = s_offsetTableSize;
for (unsigned i = 0; i < s_offsetTableEntries - 1; i++) {
unsigned numberOfEntries = m_buffer[i];
-
- if (numberOfEntries > 0) {
-#if CPU(NEEDS_ALIGNED_ACCESS)
- offset = roundUpToMultipleOf(metadataAlignment(static_cast<OpcodeID>(i)), offset);
-#endif
- m_buffer[i] = offset;
- offset += numberOfEntries * metadataSize(static_cast<OpcodeID>(i));
- } else
- m_buffer[i] = offset;
+ m_buffer[i] = offset;
+ offset += numberOfEntries * metadataSize(static_cast<OpcodeID>(i));
}
m_buffer[s_offsetTableEntries - 1] = offset;
}
Modified: tags/Safari-607.1.13/Source/_javascript_Core/generator/Section.rb (237963 => 237964)
--- tags/Safari-607.1.13/Source/_javascript_Core/generator/Section.rb 2018-11-08 01:29:21 UTC (rev 237963)
+++ tags/Safari-607.1.13/Source/_javascript_Core/generator/Section.rb 2018-11-08 01:29:25 UTC (rev 237964)
@@ -81,19 +81,6 @@
i += 1
end
out << "\n"
-
- out.write("#define FOR_EACH_#{config[:macro_name_component]}_METADATA_ALIGNMENT(macro) \\\n")
- i = 0
- while true
- if opcodes[i].metadata.empty?
- out << "\n"
- break
- end
-
- out.write("macro(alignof(#{opcodes[i].capitalized_name}::Metadata))\\\n")
- i += 1
- end
- out << "\n"
end
if config[:emit_opcode_id_string_values_in_h_file]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
