diff --git a/src/objects-inl.h b/src/objects-inl.h index bb24a2f854..b8f3bd5422 100644 --- a/src/objects-inl.h +++ b/src/objects-inl.h @@ -2336,7 +2336,7 @@ String* SlicedString::parent() { void SlicedString::set_parent(String* parent) { - ASSERT(parent->IsSeqString()); + ASSERT(parent->IsSeqString() || parent->IsExternalString()); WRITE_FIELD(this, kParentOffset, parent); } diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc index 630dfb08d0..93f7588d36 100644 --- a/test/cctest/test-strings.cc +++ b/test/cctest/test-strings.cc @@ -1,4 +1,4 @@ -// Copyright 2006-2008 the V8 project authors. All rights reserved. +// Copyright 2011 the V8 project authors. All rights reserved. // Check that we can traverse very deep stacks of ConsStrings using // StringInputBuffer. Check that Get(int) works on very deep stacks diff --git a/test/mjsunit/string-slices-regexp.js b/test/mjsunit/string-slices-regexp.js index a8cadaedd5..df01574d83 100644 --- a/test/mjsunit/string-slices-regexp.js +++ b/test/mjsunit/string-slices-regexp.js @@ -1,4 +1,4 @@ -// 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: diff --git a/test/mjsunit/string-slices.js b/test/mjsunit/string-slices.js index 40b9a20d1c..7c40229c75 100755 --- a/test/mjsunit/string-slices.js +++ b/test/mjsunit/string-slices.js @@ -1,4 +1,4 @@ -// Copyright 2008 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: diff --git a/tools/logreader.js b/tools/logreader.js index 315e721276..b23add4481 100644 --- a/tools/logreader.js +++ b/tools/logreader.js @@ -1,4 +1,4 @@ -// 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: