roll clang 148039:148911

BUG=97532,111806,111208 (maybe?)
TEST=none
TBR=hans

Review URL: http://codereview.chromium.org/9297028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119637 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 1 deletions

diff --git a/build/common.gypi b/build/common.gypi
index dda1815..7299c55 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1931,6 +1931,15 @@
               # This (rightyfully) complains about 'override', which we use
               # heavily.
               '-Wno-c++11-extensions',
+
+              # Warns on switches on enums that cover all enum values but
+              # also contain a default: branch. Chrome is full of that.
+              '-Wno-covered-switch-default',
+
+              # TODO(thakis): Reenable once this no longer complains about
+              # Invalid() in gmocks's gmock-internal-utils.h
+              # http://crbug.com/111806
+              '-Wno-null-dereference',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
@@ -2284,6 +2293,15 @@
                 # This (rightyfully) complains about 'override', which we use
                 # heavily.
                 '-Wno-c++11-extensions',
+
+                # Warns on switches on enums that cover all enum values but
+                # also contain a default: branch. Chrome is full of that.
+                '-Wno-covered-switch-default',
+
+                # TODO(thakis): Reenable once this no longer complains about
+                # Invalid() in gmock's gmock-internal-utils.h
+                # http://crbug.com/111806
+                '-Wno-null-dereference',
               ],
             }],
             ['clang==1 and clang_use_chrome_plugins==1', {
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm
index 131844e..e5d3a82 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/chrome/common/mac/objc_zombie.mm
@@ -199,12 +199,15 @@ void ZombieDealloc(id self, SEL _cmd) {
   // |_internal_object_dispose()| (in objc-class.m) does this, so it
   // should be safe (messaging free'd objects shouldn't be expected to
   // be thread-safe in the first place).
+#pragma clang diagnostic push  // clang warns about direct access to isa.
+#pragma clang diagnostic ignored "-Wdeprecated-objc-isa-usage"
   if (size >= g_fatZombieSize) {
     self->isa = g_fatZombieClass;
     static_cast<CrFatZombie*>(self)->wasa = wasa;
   } else {
     self->isa = g_zombieClass;
   }
+#pragma clang diagnostic pop
 
   // The new record to swap into |g_zombies|.  If |g_zombieCount| is
   // zero, then |self| will be freed immediately.
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 341f47a..2e748e0 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -8,7 +8,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=148039
+CLANG_REVISION=148911
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"