commit 499aaa52a876ef8e8b81ac115cafb969eb585c96
author sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Mon Nov 30 08:07:20 2009 +0000
committer sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Mon Nov 30 08:07:20 2009 +0000
tree c9ff5265ce5aaa3580a1e4b43c3bf81da2838b36
parent 01beca7f8d9f549e04ec575a0bca96d859ab55a5

Merge revisions r3372 - r3374 to trunk

This is on order to try out the changes related to http://crbug.com/23058 on trunk before merging them to the beta branch.
Review URL: http://codereview.chromium.org/449010

git-svn-id: http://v8.googlecode.com/svn/trunk@3376 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/objects-inl.h

diff --git a/src/objects-inl.h b/src/objects-inl.h
index 7a6444d..069a675 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -2441,8 +2441,7 @@
 ACCESSORS(Script, wrapper, Proxy, kWrapperOffset)
 ACCESSORS(Script, type, Smi, kTypeOffset)
 ACCESSORS(Script, compilation_type, Smi, kCompilationTypeOffset)
-ACCESSORS(Script, line_ends_fixed_array, Object, kLineEndsFixedArrayOffset)
-ACCESSORS(Script, line_ends_js_array, Object, kLineEndsJSArrayOffset)
+ACCESSORS(Script, line_ends, Object, kLineEndsOffset)
 ACCESSORS(Script, eval_from_function, Object, kEvalFromFunctionOffset)
 ACCESSORS(Script, eval_from_instructions_offset, Smi,
           kEvalFrominstructionsOffsetOffset)