Reviewers: ,
Message:
PTAL
Description:
Merged r17620, r17621 into trunk branch.
Fix potential assertion failure in ConvertCase.
Fix potential assertion failure.
BUG=
Please review this at https://codereview.chromium.org/66513006/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files (+3, -10 lines):
M src/factory.cc
M src/objects.h
M src/objects.cc
M src/runtime.cc
M src/version.cc
Index: src/factory.cc
diff --git a/src/factory.cc b/src/factory.cc
index
cccc3e76297b20a2ade4272efcd978e7d0c2f06b..da85b12fc85dab8f876d1f055bd2d34eef4cf799
100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -310,8 +310,7 @@ Handle<String> ConcatStringContent(Handle<StringType>
result,
Handle<String> Factory::NewFlatConcatString(Handle<String> first,
Handle<String> second) {
int total_length = first->length() + second->length();
- if (first->IsOneByteRepresentationUnderneath() &&
- second->IsOneByteRepresentationUnderneath()) {
+ if (first->IsOneByteRepresentation() &&
second->IsOneByteRepresentation()) {
return ConcatStringContent<uint8_t>(
NewRawOneByteString(total_length), first, second);
} else {
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
441c25e70c649aecb7b54f49d5670c1daf136569..e5b4763240f3f8a4f50449e2fe71a1281d63f343
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -8339,11 +8339,6 @@ SmartArrayPointer<char>
String::ToCString(AllowNullsFlag allow_nulls,
}
-const uc16* String::GetTwoByteData() {
- return GetTwoByteData(0);
-}
-
-
const uc16* String::GetTwoByteData(unsigned start) {
ASSERT(!IsOneByteRepresentationUnderneath());
switch (StringShape(this).representation_tag()) {
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
3105579e28f4e3aee5b4b0235247c8a9af11ac61..0099cb2095ec4e37a30447f0156ac96a96f5c2b0
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -8611,7 +8611,6 @@ class String: public Name {
static const int kMaxShortPrintLength = 1024;
// Support for regular expressions.
- const uc16* GetTwoByteData();
const uc16* GetTwoByteData(unsigned start);
// Helper function for flattening strings.
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
c9f152f9daccb94f48058c8d709362be25e0de9f..0107fce945f264b630d520f706d2381de005f8ef
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -6444,7 +6444,7 @@ MUST_USE_RESULT static MaybeObject* ConvertCase(
}
}
- String::Encoding result_encoding = s->IsOneByteRepresentationUnderneath()
+ String::Encoding result_encoding = s->IsOneByteRepresentation()
? String::ONE_BYTE_ENCODING : String::TWO_BYTE_ENCODING;
Object* answer;
{ MaybeObject* maybe_answer = ConvertCaseHelper(
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
621ac34da38719e62eda95e2939f454344250154..e8493b4297343cde5fd89afe73002deea517942e
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 1
-#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
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
