Revision: 17623
Author: [email protected]
Date: Mon Nov 11 16:29:16 2013 UTC
Log: Merged r17620, r17621 into trunk branch.
Fix potential assertion failure in ConvertCase.
Fix potential assertion failure.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/66513006
http://code.google.com/p/v8/source/detail?r=17623
Modified:
/trunk/src/factory.cc
/trunk/src/objects.cc
/trunk/src/objects.h
/trunk/src/runtime.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/factory.cc Wed Nov 6 12:03:29 2013 UTC
+++ /trunk/src/factory.cc Mon Nov 11 16:29:16 2013 UTC
@@ -310,8 +310,7 @@
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 {
=======================================
--- /trunk/src/objects.cc Fri Nov 8 10:23:52 2013 UTC
+++ /trunk/src/objects.cc Mon Nov 11 16:29:16 2013 UTC
@@ -8337,11 +8337,6 @@
int* length_return) {
return ToCString(allow_nulls, robust_flag, 0, -1, length_return);
}
-
-
-const uc16* String::GetTwoByteData() {
- return GetTwoByteData(0);
-}
const uc16* String::GetTwoByteData(unsigned start) {
=======================================
--- /trunk/src/objects.h Fri Nov 8 10:23:52 2013 UTC
+++ /trunk/src/objects.h Mon Nov 11 16:29:16 2013 UTC
@@ -8611,7 +8611,6 @@
static const int kMaxShortPrintLength = 1024;
// Support for regular expressions.
- const uc16* GetTwoByteData();
const uc16* GetTwoByteData(unsigned start);
// Helper function for flattening strings.
=======================================
--- /trunk/src/runtime.cc Fri Nov 8 10:23:52 2013 UTC
+++ /trunk/src/runtime.cc Mon Nov 11 16:29:16 2013 UTC
@@ -6444,7 +6444,7 @@
}
}
- 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(
=======================================
--- /trunk/src/version.cc Fri Nov 8 10:23:52 2013 UTC
+++ /trunk/src/version.cc Mon Nov 11 16:29:16 2013 UTC
@@ -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.
