Merge up to 8597 to experimental/gc from the bleeding edge.

src/extensions/experimental/collator.cc

Index: src/extensions/experimental/collator.cc
===================================================================
--- src/extensions/experimental/collator.cc	(revision 8618)
+++ src/extensions/experimental/collator.cc	(working copy)
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "collator.h"
+#include "src/extensions/experimental/collator.h"
 
 #include "unicode/coll.h"
 #include "unicode/locid.h"
@@ -153,6 +153,11 @@
   bool ignore_case, ignore_accents, numeric;
 
   if (ExtractBooleanOption(options, "ignoreCase", &ignore_case)) {
+    // We need to explicitly set the level to secondary to get case ignored.
+    // The default L3 ignores UCOL_CASE_LEVEL == UCOL_OFF !
+    if (ignore_case) {
+      collator->setStrength(icu::Collator::SECONDARY);
+    }
     collator->setAttribute(UCOL_CASE_LEVEL, ignore_case ? UCOL_OFF : UCOL_ON,
                            status);
     if (U_FAILURE(status)) {
@@ -215,4 +220,3 @@
 }
 
 } }  // namespace v8::internal
-