Merge revision 9060 to trunk (removal of bogus assert)
Review URL: http://codereview.chromium.org/7796001
git-svn-id: http://v8.googlecode.com/svn/trunk@9061 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index 192fbf0..4ca83a4 100644
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -226,7 +226,6 @@
AssertNoAllocation no_heap_allocation; // ensure vectors stay valid
String* needle = String::cast(re->DataAt(JSRegExp::kAtomPatternIndex));
- ASSERT(StringShape(needle).IsSequential());
int needle_len = needle->length();
ASSERT(needle->IsFlat());
diff --git a/src/version.cc b/src/version.cc
index bf11f4f..3fd0fd5 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 5
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0