1. 29 Dec, 2010 5 commits
    • spop's avatar
      Use diagnostic-core.h instead of diagnostic.h. · 52f91c04
      spop authored
      2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
      
      	* Makefile.in (graphite.o): Depends on DIAGNOSTIC_CORE_H.
      	(graphite-clast-to-gimple.o): Same.
      	(graphite-poly.o): Same.
      	* graphite-clast-to-gimple.c: Include diagnostic-core.h.
      	* graphite-poly.c: Same.
      	* graphite.c: Same.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168310 138bc75d-0d04-0410-961f-82ee72b054a4
      52f91c04
    • jason's avatar
      PR c++/47068 · dff917fb
      jason authored
      	* semantics.c (finish_id_expression): Don't note non-names
      	as being used in the class.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168309 138bc75d-0d04-0410-961f-82ee72b054a4
      dff917fb
    • jason's avatar
      * parser.c (cp_parser_unary_expression): Remove redundant C++0x · cad7fbbd
      jason authored
      	check.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168308 138bc75d-0d04-0410-961f-82ee72b054a4
      cad7fbbd
    • nicola's avatar
      In gcc/objc/: · 89e83a91
      nicola authored
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	PR objc/47076
      	* objc-act.c (lookup_protocol): Added 'definition_required'
      	argument.  If 'definition_required', and the protocol is not
      	defined, emit a warning.
      	(objc_declare_protocols): Updated call to lookup_protocol.
      	(start_protocol): Same change.
      	(check_protocol_recursively): Same change.
      	(objc_build_protocol_expr): Same change.
      	(lookup_and_install_protocols): Added definition_required argument.
      	Pass it to lookup_protocol.
      	(objc_get_protocol_qualified_type): Updated call to
      	lookup_and_install_protocols.
      	(start_class): Updated calls to lookup_and_install_protocols; pass
      	true to 'definition_required' to get the warnings.
      	(start_protocol): Updated calls to lookup_and_install_protocols.
      
      In gcc/testsuite/:
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	PR objc/47076
      	* objc.dg/protocol-forward-1.m: New.
      	* obj-c++.dg/protocol-forward-1.mm: New.
      	* objc.dg/attributes/proto-attribute-2.m: Updated.
      	* objc.dg/class-protocol-1.m: Updated.
      	* obj-c++.dg/attributes/proto-attribute-2.mm: Updated.
      	* obj-c++.dg/class-protocol-1.mm: Updated.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168307 138bc75d-0d04-0410-961f-82ee72b054a4
      89e83a91
    • gccadmin's avatar
      Daily bump. · 1856340d
      gccadmin authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168306 138bc75d-0d04-0410-961f-82ee72b054a4
      1856340d
  2. 28 Dec, 2010 10 commits
    • janus's avatar
      2010-12-28 Janus Weil <janus@gcc.gnu.org> · e2f2adf9
      janus authored
      	    Daniel Franke  <dfranke@gcc.gnu.org>
      
      	PR fortran/45827
      	* module.c (mio_component_ref): Handle components of CLASS variables.
      
      
      2010-12-28  Janus Weil  <janus@gcc.gnu.org>
      
      	PR fortran/45827
      	* gfortran.dg/class_32.f90: New.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168302 138bc75d-0d04-0410-961f-82ee72b054a4
      e2f2adf9
    • aoliva's avatar
      PR debug/46931 · 5d206f11
      aoliva authored
      * tree-vect-loop-manip.c (slpeel_tree_peel_loop_to_edge): Update
      SSA before removing dead stmts.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168299 138bc75d-0d04-0410-961f-82ee72b054a4
      5d206f11
    • hjl's avatar
      Replace _rdrand_uXX with _rdrandXX_step. · 2d1e402c
      hjl authored
      gcc/
      
      2010-12-28  H.J. Lu  <hongjiu.lu@intel.com>
      	    Uros Bizjak  <ubizjak@gmail.com>
      
      	* config/i386/i386-builtin-types.def (PUSHORT): New.
      	(INT_FTYPE_PUSHORT): Likewise.
      	(INT_FTYPE_PUNSIGNED): Likewise.
      	(INT_FTYPE_PULONGLONG): Likewise.
      	Remove "DEF_FUNCTION_TYPE (UINT16)".
      
      	* config/i386/i386.c (ix86_builtins): Remove
      	IX86_BUILTIN_RDRAND16, IX86_BUILTIN_RDRAND32 and
      	IX86_BUILTIN_RDRAND64.  Add IX86_BUILTIN_RDRAND16_STEP,
      	IX86_BUILTIN_RDRAND32_STEP and IX86_BUILTIN_RDRAND64_STEP.
      	(bdesc_special_args): Remove IX86_BUILTIN_RDRAND16,
      	IX86_BUILTIN_RDRAND32 and IX86_BUILTIN_RDRAND64.
      	(ix86_init_mmx_sse_builtins): Handle IX86_BUILTIN_RDRAND16_STEP,
      	IX86_BUILTIN_RDRAND32_STEP and IX86_BUILTIN_RDRAND64_STEP.
      	(ix86_expand_builtin): Likewise.
      	(ix86_expand_special_args_builtin): Remove UINT16_FTYPE_VOID.
      
      	* config/i386/i386.md (UNSPEC_RDRAND): New.
      	(UNSPECV_RDRAND): Removed.
      	(rdrand<mode>): Likewise.
      	(rdrand<mode>_1): Also set FLAGS_REG.  Replace UNSPECV_RDRAND
      	with UNSPEC_RDRAND.
      
      	* config/i386/immintrin.h (_rdrand_u16): Removed.
      	(_rdrand_u32): Likewise.
      	(_rdrand_u64): Likewise.
      	(_rdrand16_step): New.
      	(_rdrand32_step): Likewise.
      	(_rdrand64_step): Likewise.
      
      	* doc/extend.texi (__builtin_ia32_rdrand16): Removed.
      	(__builtin_ia32_rdrand32): Likewise.
      	(__builtin_ia32_rdrand64): Likewise.
      	(__builtin_ia32_rdrand16_step): New.
      	(__builtin_ia32_rdrand32_step): Likewise.
      	(__builtin_ia32_rdrand64_step): Likewise.
      
      gcc/testsuite/
      
      2010-12-28  H.J. Lu  <hongjiu.lu@intel.com>
      
      	* gcc.target/i386/rdrand-1.c: Updated.
      	* gcc.target/i386/rdrand-2.c: Likewise.
      	* gcc.target/i386/rdrand-3.c: Likewise.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168298 138bc75d-0d04-0410-961f-82ee72b054a4
      2d1e402c
    • spop's avatar
      Fix bootstrap without graphite. · 589cfc02
      spop authored
      2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
      
      	* Makefile.in (graphite.o): Add dependence on DIAGNOSTIC_H.
      	* graphite.c: Include diagnostic.h.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168297 138bc75d-0d04-0410-961f-82ee72b054a4
      589cfc02
    • spop's avatar
      Do not include unnecessary .h files. · 1e5b7b1f
      spop authored
      2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
      
      	* Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
      	(tree-browser.o): Update dependences.
      	(omega.o): Same.
      	(tree-chrec.o): Same.
      	(tree-scalar-evolution.o): Same.
      	(tree-data-ref.o): Same.
      	(sese.o): Same.
      	(graphite.o): Same.
      	(graphite-blocking.o): Same.
      	(graphite-clast-to-gimple.o): Same.
      	(graphite-cloog-util.o): Same.
      	(graphite-dependences.o): Same.
      	(graphite-flattening.o): Same.
      	(graphite-interchange.o): Same.
      	(graphite-poly.o): Same.
      	(graphite-ppl.o): Same.
      	(graphite-scop-detection.o): Same.
      	(graphite-sese-to-poly.o): Same.
      	(tree-loop-linear.o): Same.
      	(tree-loop-distribution.o): Same.
      	(tree-parloops.o): Same.
      	(lambda-mat.o): Same.
      	(lambda-trans.o): Same.
      	(lambda-code.o): Same.
      	* tree-browser.o: Do not include unnecessary .h files.
      	* omega.o: Same.
      	* tree-chrec.o: Same.
      	* tree-scalar-evolution.o: Same.
      	* tree-data-ref.o: Same.
      	* sese.o: Same.
      	* graphite.o: Same.
      	* graphite-blocking.o: Same.
      	* graphite-clast-to-gimple.o: Same.
      	* graphite-cloog-util.o: Same.
      	* graphite-dependences.o: Same.
      	* graphite-flattening.o: Same.
      	* graphite-interchange.o: Same.
      	* graphite-poly.o: Same.
      	* graphite-ppl.o: Same.
      	* graphite-scop-detection.o: Same.
      	* graphite-sese-to-poly.o: Same.
      	* tree-loop-linear.o: Same.
      	* tree-loop-distribution.o: Same.
      	* tree-parloops.o: Same.
      	* lambda-mat.o: Same.
      	* lambda-trans.o: Same.
      	* lambda-code.o: Same.
      	* graphite.h: Removed.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168296 138bc75d-0d04-0410-961f-82ee72b054a4
      1e5b7b1f
    • pkoning's avatar
      * config/pdp11/pdp11.md: Correct length attribute for float · dd26f429
      pkoning authored
      literal case.
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168295 138bc75d-0d04-0410-961f-82ee72b054a4
      dd26f429
    • nicola's avatar
      In gcc/objc/: · 598d5210
      nicola authored
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc-act.c (objc_start_category_interface): Produce an error if
      	a class extension is found after the class @implementation.
      
      In gcc/testsuite/:
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/class-extension-4.m: New.
      	* obj-c++.dg/class-extension-4.mm: New.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168294 138bc75d-0d04-0410-961f-82ee72b054a4
      598d5210
    • jiez's avatar
      * builtins.c (SLOW_UNALIGNED_ACCESS): Remove. · e39f3a16
      jiez authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168293 138bc75d-0d04-0410-961f-82ee72b054a4
      e39f3a16
    • nicola's avatar
      In gcc/testsuite/: · 39c05f29
      nicola authored
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	PR objc/47073
      	* objc.dg/incomplete-type-1.m: New test.
      
      In gcc/objc/:
      2010-12-28  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	PR objc/47073
      	* objc-act.c (encode_method_prototype): Fixed both location and
      	format string of error "type %qT does not have a known size".
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168285 138bc75d-0d04-0410-961f-82ee72b054a4
      39c05f29
    • gccadmin's avatar
      Daily bump. · 12e9b994
      gccadmin authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168284 138bc75d-0d04-0410-961f-82ee72b054a4
      12e9b994
  3. 27 Dec, 2010 5 commits
  4. 26 Dec, 2010 9 commits
    • nicola's avatar
      In gcc/testsuite/: · 5bee57c5
      nicola authored
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/gnu-api-2-class.m: Xfail the test on Apple Darwin m64.
      	* objc.dg/gnu-api-2-ivar.m: Same.
      	* objc.dg/gnu-api-2-method.m: Same.
      	* objc.dg/gnu-api-2-objc.m: Same.
      	* objc.dg/gnu-api-2-object.m: Same.
      	* objc.dg/gnu-api-2-protocol.m: Same.
      	* obj-c++.dg/gnu-api-2-class.mm: Same.
      	* obj-c++.dg/gnu-api-2-ivar.mm: Same.
      	* obj-c++.dg/gnu-api-2-method.mm: Same.
      	* obj-c++.dg/gnu-api-2-objc.mm: Same.
      	* obj-c++.dg/gnu-api-2-object.mm: Same.
      	* obj-c++.dg/gnu-api-2-protocol.mm: Same.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168256 138bc75d-0d04-0410-961f-82ee72b054a4
      5bee57c5
    • jamborm's avatar
      2010-12-26 Martin Jambor <mjambor@suse.cz> · d71f105a
      jamborm authored
      	* tree.c (get_binfo_at_offset): Use BINFO_TYPE instead of TREE_TYPE,
      	compare TYPE_MAIN_VARIANTs of types.
      
      
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168255 138bc75d-0d04-0410-961f-82ee72b054a4
      d71f105a
    • nicola's avatar
      In gcc/testsuite/: · 5d8940e8
      nicola authored
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/pr44509.m: New.
      
      In gcc/objc/:
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* config-lang.in (gtfiles): Added c-family/c-cppbuiltin.c.
      
      In gcc/objcp/:
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* config-lang.in (gtfiles): Added c-family/c-cppbuiltin.c.
      
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168254 138bc75d-0d04-0410-961f-82ee72b054a4
      5d8940e8
    • schwab's avatar
      * gcc/config/m68k/t-linux (M68K_MLIB_CPU): Only include 680x0 CPUs. · dadc0876
      schwab authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168253 138bc75d-0d04-0410-961f-82ee72b054a4
      dadc0876
    • nicola's avatar
      In gcc/testsuite/: · 2e65d946
      nicola authored
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/gnu-api-2-class.m: Updated the test to work with the
      	Apple runtime as well.
      	* obj-c++.dg/gnu-api-2-class.mm: Same change.
      	* objc.dg/gnu-api-2-ivar.m: Same change.
      	* obj-c++.dg/gnu-api-2-ivar.mm: Same change.
      	* objc.dg/gnu-api-2-method.m: Same change.
      	* obj-c++.dg/gnu-api-2-method.mm: Same change.
      	* objc.dg/gnu-api-2-objc.m: Same change.
      	* obj-c++.dg/gnu-api-2-objc.mm: Same change.
      	* objc.dg/gnu-api-2-object.m: Same change.
      	* obj-c++.dg/gnu-api-2-object.mm: Same change.
      	* objc.dg/gnu-api-2-property.m: Same change.
      	* obj-c++.dg/gnu-api-2-property.mm: Same change.
      	* objc.dg/gnu-api-2-protocol.m: Same change.
      	* obj-c++.dg/gnu-api-2-protocol.mm: Same change.
      
      	* objc.dg/gnu-api-2-objc.m: Also, fixed test for
      	objc_disposeClassPair not to create a new class pair with the same
      	name as an existing class, and to test that the class pair is
      	created correctly.
      	* obj-c++.dg/gnu-api-2-objc.mm: Same change.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168252 138bc75d-0d04-0410-961f-82ee72b054a4
      2e65d946
    • nicola's avatar
      In libobjc/: · 6e4aa40c
      nicola authored
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* init.c (create_tree_of_subclasses_inherited_from): Use
      	class_superclass_of_class instead of assuming a class is
      	unresolved when it could be resolved.  Tidied up code.
      	(__objc_tree_insert_class): Enhanced DEBUG_PRINTF.
      	(objc_tree_insert_class): Tidied up loop; return immediately upon
      	inserting a class.
      	(__objc_exec_class): Do not set __objc_class_tree_list.
      	
      In gcc/testsuite/:
      2010-12-26  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/special/special.exp: Added load-category-2 and
      	load-category-3 tests.
      	* objc.dg/special/load-category-2.h: New.
      	* objc.dg/special/load-category-2.m: New.
      	* objc.dg/special/load-category-2a.m: New.
      	* objc.dg/special/load-category-3.h: New.
      	* objc.dg/special/load-category-3.m: New.
      	* objc.dg/special/load-category-3a.m: New.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168251 138bc75d-0d04-0410-961f-82ee72b054a4
      6e4aa40c
    • jsm28's avatar
      * sv.po: Update. · 2a84aaf0
      jsm28 authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168250 138bc75d-0d04-0410-961f-82ee72b054a4
      2a84aaf0
    • uros's avatar
      * ChangeLog: Fix formatting issues and remove duplicate entries. · ac3c1847
      uros authored
      	* testsuite/ChangeLog: Ditto.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168249 138bc75d-0d04-0410-961f-82ee72b054a4
      ac3c1847
    • gccadmin's avatar
      Daily bump. · 7c18c89e
      gccadmin authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168248 138bc75d-0d04-0410-961f-82ee72b054a4
      7c18c89e
  5. 25 Dec, 2010 4 commits
  6. 24 Dec, 2010 7 commits
    • nicola's avatar
      In libobjc/: · 53f87f10
      nicola authored
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* selector.c (sel_getTypedSelector): Return NULL if given a NULL
      	argument.
      	(sel_registerTypedName): Same.
      	(sel_registerName): Same.
      	* objc/runtime.h: Updated documentation.
      	
      In gcc/testsuite/:
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/gnu-api-2-sel.m: Test calling sel_getUid,
      	sel_registerName and sel_registerTypedName with NULL arguments.
      	Updated the test to work with the Apple runtime as well.
      	* obj-c++.dg/gnu-api-2-sel.mm: Same change.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168231 138bc75d-0d04-0410-961f-82ee72b054a4
      53f87f10
    • nicola's avatar
      In libobjc/: · f3031d35
      nicola authored
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc/runtime.h (class_addIvar): Updated documentation.  The
      	alignment is actually the log_2 of the alignment in bytes.
      	* ivars.c (class_addIvar): Corresponding change to the
      	implementation.
      
      In gcc/testsuite/:
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/gnu-api-2-class.m: Updated test to pass log_2 of the
      	alignment to class_addIvar, instead of the alignment itself.
      	* obj-c++.dg/gnu-api-2-class.mm: Same change.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168230 138bc75d-0d04-0410-961f-82ee72b054a4
      f3031d35
    • nicola's avatar
      In libobjc/: · 2461b033
      nicola authored
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc/runtime.h (sel_getType): Renamed to sel_getTypeEncoding to
      	be consistent with method_getTypeEncoding and
      	ivar_getTypeEncoding.
      	(sel_copyTypedSelectorList, sel_getTypedSelector): New.
      	* selector.c (sel_getType): Renamed to sel_getTypeEncoding.
      	(sel_copyTypedSelectorList, sel_getTypedSelector): New.
      	(sel_get_type): Updated call to sel_getType.
      	
      In gcc/testsuite/:
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc.dg/gnu-api-2-sel.m: Updated for renaming of sel_getType to
      	sel_getTypeEncoding.  Test that sel_getTypeEncoding returns NULL
      	when called with a NULL argument.  Added test for
      	sel_copyTypedSelectorList and sel_getTypedSelector.
      	* obj-c++.dg/gnu-api-2-sel.mm: Same changes.
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168229 138bc75d-0d04-0410-961f-82ee72b054a4
      2461b033
    • ebotcazou's avatar
      * gnat.dg/opt13_pkg.ad[sb]: Fix line ending. · 3ef86c58
      ebotcazou authored
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168227 138bc75d-0d04-0410-961f-82ee72b054a4
      3ef86c58
    • nicola's avatar
      In libobjc/: · f2187fb0
      nicola authored
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* objc/runtime.h (class_conformsToProtocol,
      	class_copyProtocolList): Updated documentation.
      
      In gcc/testsuite/:
      2010-12-24  Nicola Pero  <nicola.pero@meta-innovation.com>
      
      	* obj-c.dg/gnu-api-2-class.m: Test that class_conformsToProtocol()
      	does not check the superclasses.
      	* obj-c++.dg/gnu-api-2-class.mm: Same change.	
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168226 138bc75d-0d04-0410-961f-82ee72b054a4
      f2187fb0
    • amonakov's avatar
      PR rtl-optimization/47036 · afd14b63
      amonakov authored
      	* sel-sched-ir.c (fallthru_bb_of_jump): Remove special support for
      	unconditional jumps.
      	* sel-sched.c (moveup_expr): Ditto.
      
      testsuite:
      	* g++.dg/opt/pr47036.C: New.
      
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168225 138bc75d-0d04-0410-961f-82ee72b054a4
      afd14b63
    • tkoenig's avatar
      2010-12-24 Thomas Koenig <tkoenig@gcc.gnu.org> · b9dab37b
      tkoenig authored
      	PR fortran/31821
      	* check.c (gfc_var_strlen):  New function, also including
      	substring references.
      	(gfc_check_same_strlen):  Use gfc_var_strlen.
      
      2010-12-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
      
      	PR fortran/31821
      	* gfortran.dg/char_pointer_assign_6.f90:  New test.
      
      
      
      git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168224 138bc75d-0d04-0410-961f-82ee72b054a4
      b9dab37b